[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 55 commits - afms/makefile.mk cppunit/ldflags.patch cppunit/makefile.mk cppunit/prj hyphen/hyphen-2.4.patch hyphen/hyphen-2.7.1.patch hyphen/hyphen-2.7.1-read-charset.patch hyphen/makefile.mk hyphen/prj libtextcat/data libtextcat/makefile.mk libxmlsec/makefile.mk libxmlsec/xmlsec1-olderlibxml2.patch lpsolve/makefile.mk openssl/openssllnx.patch openssl/opensslmingw.patch redland/raptor redland/rasqal redland/redland
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Mar 9 00:55:20 PST 2011
afms/makefile.mk | 3
cppunit/ldflags.patch | 7
cppunit/makefile.mk | 5
cppunit/prj/d.lst | 1
hyphen/hyphen-2.4.patch | 176 --------
hyphen/hyphen-2.7.1-read-charset.patch | 20
hyphen/hyphen-2.7.1.patch | 72 +++
hyphen/makefile.mk | 10
hyphen/prj/d.lst | 4
libtextcat/data/new_fingerprints/fpdb.conf | 3
libtextcat/data/new_fingerprints/lm/serbian-latin.lm | 400 +++++++++++++++++++
libtextcat/data/new_fingerprints/lm/serbian.lm | 400 +++++++++++++++++++
libtextcat/data/new_fingerprints/lm/serbian_ascii.lm | 400 -------------------
libtextcat/makefile.mk | 4
libxmlsec/makefile.mk | 10
libxmlsec/xmlsec1-olderlibxml2.patch | 2
lpsolve/makefile.mk | 2
openssl/openssllnx.patch | 11
openssl/opensslmingw.patch | 4
redland/raptor/makefile.mk | 4
redland/rasqal/makefile.mk | 4
redland/redland/makefile.mk | 4
22 files changed, 938 insertions(+), 608 deletions(-)
New commits:
commit 9152d619dda6e7aa39fb8c575567f5e60ca8c385
Merge: ee0684f... b04a536...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Mar 9 09:55:09 2011 +0100
Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
cppunit/ldflags.patch
hyphen/hyphen-2.4.patch
libegg/source/eggtrayicon.c
libtextcat/makefile.mk
diff --cc cppunit/makefile.mk
index 7c4d548,043ce74..a842e42
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@@ -80,11 -93,11 +80,11 @@@ CONFIGURE_FLAGS = --prefix=$(shell cd $
pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
--disable-dependency-tracking --disable-static --disable-doxygen \
--disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
- CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
- LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
- LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
+ CXXFLAGS='$(EXTRA_CFLAGS)' \
+ LDFLAGS='$(LDFLAGS)' \
+ LIBS='$(MY_LIBS)'
- BUILD_ACTION = $(GNUMAKE)
+ BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
@@@ -114,11 -169,11 +115,11 @@@ CONFIGURE_FLAGS = --prefix=$(shell cd $
pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
--disable-dependency-tracking --disable-static --disable-doxygen \
--disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
- CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
- LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
- LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
+ CXXFLAGS='$(EXTRA_CFLAGS)' \
+ LDFLAGS='$(LDFLAGS)' \
+ LIBS='$(MY_LIBS)'
- BUILD_ACTION = $(GNUMAKE)
+ BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
commit b04a5364dfbf23f7e89c99894a558090ad9ad9cd
Merge: e73fcc9... 6998f16...
Author: Mathias Bauer <mba at openoffice.org>
Date: Thu Feb 3 15:53:56 2011 +0100
CWS gnumake3: resync to m99
commit e73fcc972105e831bed486fc3191929f47091b67
Author: Takashi Ono <tono at openoffice.org>
Date: Thu Feb 3 10:02:58 2011 +0100
CWS gnumake3: adapt mingw port to new features in cws
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 9441e92..043ce74 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -104,6 +104,7 @@ OUTDIR2INC = ooo-install/include/cppunit
OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
ooo-install/bin/cygcppunit-1-12-1.dll
+OUT2LIB = ooo-install/lib/libcppunit.dll.a
.INCLUDE: set_ext.mk
.INCLUDE: target.mk
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 6ecac46..fb7c119 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -17,6 +17,7 @@ mkdir: %_DEST%\inc%_EXT%\cppunit\ui\text
..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib%_EXT%\icppunit_dll.lib
..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin%_EXT%\cygcppunit-1-12-1.dll
+..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib%_EXT%\libcppunit.dll.a
..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib
symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.dylib
commit 6998f16d9aa1b4d93648e0bbdee9050726b89ad8
Merge: 3397c96... bfd44bd...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu Jan 27 16:53:34 2011 +0100
CWS-TOOLING: integrate CWS tl84
commit f1f4fc29ddc1f061dab156132f53b7e4237c5bf3
Merge: 5ef131a... 3397c96...
Author: Mathias Bauer <mba at openoffice.org>
Date: Tue Jan 25 18:35:57 2011 +0100
CWS gnumake3: resync to m98
commit 5ef131a9eaaf967d8996dba8ad71b4adda415e51
Merge: d36a82b... dcfeb58...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Wed Jan 19 16:36:58 2011 +0100
gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing
commit 3397c96e25fe093535edf209fb57e91be6136dd3
Merge: dcfeb58... fad7fab...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jan 19 12:20:03 2011 +0100
CWS-TOOLING: integrate CWS mingwport33
commit bfd44bdd03589aa1a09f23568fc5203999b4d378
Author: Thomas Lange [tl] <tl at openoffice.org>
Date: Tue Jan 18 16:59:34 2011 +0100
cws tl84: #i109543# fixed d.lst to match new output sub-directory
diff --git a/hyphen/prj/d.lst b/hyphen/prj/d.lst
index 0223cc6..4b7ff0b 100644
--- a/hyphen/prj/d.lst
+++ b/hyphen/prj/d.lst
@@ -1,5 +1,5 @@
..\%__SRC%\slb\hyphen.lib %_DEST%\lib%_EXT%\hyphen.lib
..\%__SRC%\inc\hyphen.h %_DEST%\inc%_EXT%\hyphen.h
-..\%__SRC%\misc\build\hyphen-2.4\.libs\libhyphen.a %_DEST%\lib%_EXT%\libhyphen.a
-..\%__SRC%\misc\build\hyphen-2.4\hyph_en_US.dic %_DEST%\bin%_EXT%\hyph_en_US.dic
+..\%__SRC%\misc\build\hyphen-2.7.1\.libs\libhyphen.a %_DEST%\lib%_EXT%\libhyphen.a
+..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin%_EXT%\hyph_en_US.dic
commit ac0ee4117eec557ede501a34b6c8954b797f542d
Author: Thomas Lange [tl] <tl at openoffice.org>
Date: Tue Jan 18 16:42:10 2011 +0100
cws tl84: #i109543# patch to fix hyphenation for Linux
diff --git a/hyphen/hyphen-2.7.1-read-charset.patch b/hyphen/hyphen-2.7.1-read-charset.patch
new file mode 100644
index 0000000..e846955
--- /dev/null
+++ b/hyphen/hyphen-2.7.1-read-charset.patch
@@ -0,0 +1,20 @@
+--- misc/hyphen-2.7.1/hyphen.c 2010-12-01 01:47:22.000000000 +0100
++++ misc/build/hyphen-2.7.1/hyphen.c 2011-01-18 16:26:50.953125000 +0100
+@@ -291,13 +291,10 @@
+ /* read in character set info */
+ if (k == 0) {
+ for (i=0;i<MAX_NAME;i++) dict[k]->cset[i]= 0;
+- if (fgets(dict[k]->cset, sizeof(dict[k]->cset),f) != NULL) {
+- for (i=0;i<MAX_NAME;i++)
+- if ((dict[k]->cset[i] == '\r') || (dict[k]->cset[i] == '\n'))
+- dict[k]->cset[i] = 0;
+- } else {
+- dict[k]->cset[0] = 0;
+- }
++ fgets(dict[k]->cset, sizeof(dict[k]->cset),f);
++ for (i=0;i<MAX_NAME;i++)
++ if ((dict[k]->cset[i] == '\r') || (dict[k]->cset[i] == '\n'))
++ dict[k]->cset[i] = 0;
+ dict[k]->utf8 = (strcmp(dict[k]->cset, "UTF-8") == 0);
+ } else {
+ strcpy(dict[k]->cset, dict[0]->cset);
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index b773437..94c1592 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -41,7 +41,9 @@ TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf
ADDITIONAL_FILES += makefile.mk
-PATCH_FILES=hyphen-2.7.1.patch
+PATCH_FILES= \
+ hyphen-2.7.1.patch \
+ hyphen-2.7.1-read-charset.patch
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
commit fad7faba7040a14f131d420bfdede1581c32fa1f
Author: tono <tono at openoffice.org>
Date: Thu Jan 6 21:56:21 2011 +0900
mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index f721db3..322f825 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -95,7 +95,7 @@ xmlsec_CC+=-shared-libgcc
.ENDIF
xmlsec_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-xmlsec_LIBS+=-lstdc++_s
+xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index 3e66303..06cc417 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -57,7 +57,7 @@ BUILD_DIR=lpsolve55
lpsolve_LDFLAGS=-shared-libgcc
.ENDIF
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-lpsolve_LIBS=-lstdc++_s
+lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
.ELSE
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch
index 10b4853..0ea8287 100755
--- a/openssl/opensslmingw.patch
+++ b/openssl/opensslmingw.patch
@@ -69,9 +69,9 @@
+goto finished
+
+:shared_gxxlib
-+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -lstdc++_s
++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 %MINGW_SHARED_LIBSTDSPP%
+if errorlevel 1 goto end
-+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -lstdc++_s
++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto %MINGW_SHARED_LIBSTDSPP%
+if errorlevel 1 goto end
+goto finished
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index b67f6ef..82e92b4 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -74,7 +74,7 @@ raptor_CC+=-shared-libgcc
.ENDIF
raptor_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-raptor_LIBS+=-lstdc++_s
+raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
CONFIGURE_DIR=
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 66fca99..6f2afc4 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -72,7 +72,7 @@ rasqal_CC+=-shared-libgcc
.ENDIF
rasqal_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-rasqal_LIBS+=-lstdc++_s
+rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
CONFIGURE_DIR=
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 20b1210..ac15584 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -72,7 +72,7 @@ redland_CC+=-shared-libgcc
.ENDIF
redland_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-redland_LIBS+=-lstdc++_s
+redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
CONFIGURE_DIR=
commit dcfeb58ddc6bfbe51a05d36694276cad1d520e6b
Merge: 9836fcd... 14995b9...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Jan 5 15:54:17 2011 +0100
CWS-TOOLING: integrate CWS jl160
commit 14995b9c71a623028687a199e04835c26915fe91
Merge: 024ce17... d36a82b...
Author: Joachim Lingner <jl at openoffice.org>
Date: Tue Jan 4 12:01:53 2011 +0100
jl160 merge with DEV300m96
commit 9836fcd16a45f5eb405bc6807c0232bfbe0632c6
Merge: ed748b7... d36a82b...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Mon Dec 27 12:33:29 2010 +0100
dr77: rebase to DEV300m96
commit d36a82beee90c264b069de70e13c37edeedf9491
Merge: 1c4f1f8... 5010f09...
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Fri Dec 17 15:06:49 2010 +0100
CWS-TOOLING: integrate CWS ause128
commit c3393d31659093a34ed257acdb62d97c97b41786
Author: Thomas Lange [tl] <tl at openoffice.org>
Date: Fri Dec 3 09:55:02 2010 +0100
cws tl84: #i109543# updating hyphen library to v2.7.1
diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch
deleted file mode 100644
index 33947f5..0000000
--- a/hyphen/hyphen-2.4.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-diff -u misc/hyphen-2.4/csutil.c misc/build/hyphen-2.4/csutil.c
---- misc/hyphen-2.4/csutil.c 2003-06-01 02:04:00.000000000 +0200
-+++ misc/build/hyphen-2.4/csutil.c 2008-06-04 10:03:40.000000000 +0200
-@@ -3493,7 +3493,7 @@
- };
-
-
--struct enc_entry encds[] = {
-+static struct enc_entry encds[] = {
- {"ISO8859-1",iso1_tbl},
- {"ISO8859-2",iso2_tbl},
- {"ISO8859-3",iso3_tbl},
-Common subdirectories: misc/hyphen-2.4/doc and misc/build/hyphen-2.4/doc
-diff -u misc/hyphen-2.4/hyphen.c misc/build/hyphen-2.4/hyphen.c
---- misc/hyphen-2.4/hyphen.c 2008-05-01 02:18:15.000000000 +0200
-+++ misc/build/hyphen-2.4/hyphen.c 2008-06-04 10:06:57.000000000 +0200
-@@ -326,7 +326,7 @@
- } else {
- hnj_strchomp(repl + 1);
- replindex = 0;
-- replcut = strlen(buf);
-+ replcut = (signed char) strlen(buf);
- }
- repl = hnj_strdup(repl + 1);
- }
-@@ -359,10 +359,10 @@
- if ((((unsigned char) word[pc]) >> 6) != 2) pu++;
- if ((ps < 0) && (replindex == pu)) {
- ps = replindex;
-- replindex = pc;
-+ replindex = (signed char) pc;
- }
- if ((ps >= 0) && ((pu - ps) == replcut)) {
-- replcut = (pc - replindex);
-+ replcut = (signed char) (pc - replindex);
- break;
- }
- }
-@@ -379,7 +379,7 @@
- dict[k]->states[state_num].repl = repl;
- dict[k]->states[state_num].replindex = replindex;
- if (!replcut) {
-- dict[k]->states[state_num].replcut = strlen(word);
-+ dict[k]->states[state_num].replcut = (signed char) strlen(word);
- } else {
- dict[k]->states[state_num].replcut = replcut;
- }
-@@ -702,7 +702,7 @@
- prep_word[j++] = '.';
- prep_word[j] = '\0';
-
-- for (i = 0; i < j; i++)
-+ for (i = 0; i < word_size + 5; i++)
- hyphens[i] = '0';
-
- #ifdef VERBOSE
-@@ -941,13 +941,13 @@
- int hnj_hyphen_norm(const char *word, int word_size, char * hyphens,
- char *** rep, int ** pos, int ** cut)
- {
-+ int i, j, k;
- if ((((unsigned char) word[0]) >> 6) == 2) {
- fprintf(stderr, "error - bad, non UTF-8 input: %s\n", word);
- return 1;
- }
-
- /* calculate UTF-8 character positions */
-- int i, j, k;
- for (i = 0, j = -1; i < word_size; i++) {
- /* beginning of an UTF-8 character (not '10' start bits) */
- if ((((unsigned char) word[i]) >> 6) != 2) j++;
-diff -u misc/hyphen-2.4/Makefile.am misc/build/hyphen-2.4/Makefile.am
---- misc/hyphen-2.4/Makefile.am 2008-04-30 12:33:44.000000000 +0200
-+++ misc/build/hyphen-2.4/Makefile.am 2008-06-04 11:33:23.000000000 +0200
-@@ -24,12 +24,12 @@
-
- hyphen.us3:
- cp -f $(srcdir)/hyphen.tex hyphen.us
-- patch < $(srcdir)/hyphen.patch
-+ $(GNUPATCH) < $(srcdir)/hyphen.patch
- $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
- cat hyphen.us hyphen.us2 >hyphen.us3
-
--hyph_en_US.dic: hyphen.us3
-- perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic ISO8859-1 2 3 >/dev/null
-+hyph_en_US.dic:
-+ @echo "hyph_en_US.txt distributed with Hyphen library"
-
- clean-local:
- rm -rf hyphen.us* hyph_en_US.dic
-diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in
---- misc/hyphen-2.4/Makefile.in 2008-04-30 14:29:57.000000000 +0200
-+++ misc/build/hyphen-2.4/Makefile.in 2008-06-04 11:33:44.000000000 +0200
-@@ -795,12 +795,12 @@
-
- hyphen.us3:
- cp -f $(srcdir)/hyphen.tex hyphen.us
-- patch < $(srcdir)/hyphen.patch
-+ $(GNUPATCH) < $(srcdir)/hyphen.patch
- $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
- cat hyphen.us hyphen.us2 >hyphen.us3
-
--hyph_en_US.dic: hyphen.us3
-- perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic ISO8859-1 2 3 >/dev/null
-+hyph_en_US.dic:
-+ @echo "hyph_en_US.txt distributed with Hyphen library"
-
- clean-local:
- rm -rf hyphen.us* hyph_en_US.dic
-diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
---- misc/hyphen-2.4/makefile.mk 2008-06-04 10:43:21.000000000 +0200
-+++ misc/build/hyphen-2.4/makefile.mk 2008-06-04 12:40:46.000000000 +0200
-@@ -1 +1,54 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ = ..$/..$/..$/..
-+
-+PRJNAME = hyphen
-+TARGET = hyphen
-+CFLAGSCALL=gsd
-+
-+USE_DEFFILE=TRUE
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+UWINAPILIB=
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+# !! not to be compiled because those belong to a stand alone programs: !!
-+# $(SLO)$/createfp.obj\
-+# $(SLO)$/testtextcat.obj
-+
-+SLOFILES= \
-+ $(SLO)$/hyphen.obj\
-+ $(SLO)$/hnjalloc.obj
-+
-+# --- Targets ------------------------------------------------------
-+
-+ALL: ALLTAR
-+
-+.INCLUDE : target.mk
-Common subdirectories: misc/hyphen-2.4/tests and misc/build/hyphen-2.4/tests
diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch
new file mode 100644
index 0000000..0e8eafa
--- /dev/null
+++ b/hyphen/hyphen-2.7.1.patch
@@ -0,0 +1,72 @@
+--- misc/hyphen-2.7.1/Makefile.am 2010-07-19 11:23:17.000000000 +0200
++++ misc/build/hyphen-2.7.1/Makefile.am 2010-12-02 10:15:44.390625000 +0100
+@@ -25,14 +25,13 @@
+
+ hyphen.us3:
+ cp -f $(srcdir)/hyphen.tex hyphen.us
+- patch < $(srcdir)/hyphen.patch
++ $(GNUPATCH) < $(srcdir)/hyphen.patch
+ $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
+ cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3
+ cat $(srcdir)/ligpatch.txt >>hyphen.us3
+
+-hyph_en_US.dic: hyphen.us3
+- perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null
+- cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic
++hyph_en_US.dic:
++ @echo "hyph_en_US.txt distributed with Hyphen library"
+
+ clean-local:
+ rm -rf hyphen.us* hyph_en_US.dic
+--- misc/hyphen-2.7.1/Makefile.in 2010-12-01 02:31:29.000000000 +0100
++++ misc/build/hyphen-2.7.1/Makefile.in 2010-12-02 10:17:16.546875000 +0100
+@@ -940,14 +940,13 @@
+
+ hyphen.us3:
+ cp -f $(srcdir)/hyphen.tex hyphen.us
+- patch < $(srcdir)/hyphen.patch
++ $(GNUPATCH) < $(srcdir)/hyphen.patch
+ $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
+ cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3
+ cat $(srcdir)/ligpatch.txt >>hyphen.us3
+
+-hyph_en_US.dic: hyphen.us3
+- perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null
+- cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic
++hyph_en_US.dic:
++ @echo "hyph_en_US.txt distributed with Hyphen library"
+
+ clean-local:
+ rm -rf hyphen.us* hyph_en_US.dic
+--- misc/hyphen-2.7.1/makefile.mk 2010-12-02 10:35:40.265625000 +0100
++++ misc/build/hyphen-2.7.1/makefile.mk 2010-12-02 10:25:45.750000000 +0100
+@@ -1 +1,28 @@
+-dummy
++PRJ = ..$/..$/..$/..
++
++PRJNAME = hyphen
++TARGET = hyphen
++CFLAGSCALL=gsd
++
++USE_DEFFILE=TRUE
++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++UWINAPILIB=
++
++.INCLUDE : settings.mk
++
++# --- Files --------------------------------------------------------
++
++# !! not to be compiled because those belong to a stand alone programs: !!
++# $(SLO)$/createfp.obj\
++# $(SLO)$/testtextcat.obj
++
++SLOFILES= \
++ $(SLO)$/hyphen.obj\
++ $(SLO)$/hnjalloc.obj
++
++# --- Targets ------------------------------------------------------
++
++ALL: ALLTAR
++
++.INCLUDE : target.mk
++
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index b733398..b773437 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -36,12 +36,12 @@ TARGET=hyphen
# --- Files --------------------------------------------------------
-TARFILE_NAME=hyphen-2.4
-TARFILE_MD5=d0b5af6e408b8d2958f3d83b5244f5e8
+TARFILE_NAME=hyphen-2.7.1
+TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf
ADDITIONAL_FILES += makefile.mk
-PATCH_FILES=hyphen-2.4.patch
+PATCH_FILES=hyphen-2.7.1.patch
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
commit 5010f09cfc98d781662752200f249fb161f7e962
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon Nov 29 18:50:33 2010 +0100
ause128: #i115689# guard additional dependencies of ZIPnTARGETN
diff --git a/afms/makefile.mk b/afms/makefile.mk
index b1d2eaf..5952ada 100644
--- a/afms/makefile.mk
+++ b/afms/makefile.mk
@@ -53,6 +53,9 @@ ZIP1LIST = *.afm -x "*Helvetica-Narrow*"
.INCLUDE : tg_ext.mk
.IF "$(L10N_framework)"==""
+.IF "$(ZIP1TARGETN)"!=""
$(ZIP1TARGETN): $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
+.ENDIF # "$(ZIP1TARGETN)"!=""
+
.ENDIF # L10N_framework
commit 3ada253ec284864b5082febf0651b3812c5bbd9e
Merge: f8b31d0... 1c4f1f8...
Author: Thomas Lange [tl] <tl at openoffice.org>
Date: Fri Nov 19 09:51:15 2010 +0100
cws tl84: merge with DEV300_m93
commit 1c632841db3a66d0e1645fc439d403a45fb8dfb2
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Tue Nov 16 12:24:00 2010 +0100
ause128: #i97286# fix copy and paste error
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 9e0c681..ff1b19a 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -36,8 +36,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
-..\msvcp90\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-..\msvcp90\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
+..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
+..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
commit f8b31d02baade2f4dd5771e56bd7ef2486002db5
Author: Thomas Lange [tl] <tl at openoffice.org>
Date: Wed Nov 10 14:26:24 2010 +0100
cws tl84: #i114751# fingerprint data for Serbian
diff --git a/libtextcat/data/new_fingerprints/fpdb.conf b/libtextcat/data/new_fingerprints/fpdb.conf
index df56f9e..329184d 100644
--- a/libtextcat/data/new_fingerprints/fpdb.conf
+++ b/libtextcat/data/new_fingerprints/fpdb.conf
@@ -68,7 +68,8 @@ russian.lm ru--utf8
sanskrit.lm sa--utf8
scots.lm sco--utf8
scots_gaelic.lm gd--utf8
-serbian_ascii.lm sh-YU-utf8
+serbian.lm sr--utf-8
+serbian-latin.lm sh--utf-8
slovak_ascii.lm sk-SK-utf8
slovenian.lm sl--utf8
spanish.lm es--utf8
diff --git a/libtextcat/data/new_fingerprints/lm/serbian-latin.lm b/libtextcat/data/new_fingerprints/lm/serbian-latin.lm
new file mode 100644
index 0000000..0a02831
--- /dev/null
+++ b/libtextcat/data/new_fingerprints/lm/serbian-latin.lm
@@ -0,0 +1,400 @@
+_ 56298
+a 17374
+i 15500
+e 13745
+o 13087
+n 9704
+r 8535
+s 7383
+t 6692
+j 6664
+u 6390
+k 6060
+a_ 5221
+v 5177
+l 5082
+d 4923
+e_ 4729
+m 4663
+p 4121
+i_ 3992
+_s 2964
+je 2847
+g 2703
+z 2575
+u_ 2521
+_p 2491
+ra 2430
+_i 2355
+na 2337
+. 2169
+, 2142
+,_ 2134
+._ 2112
+st 2091
+o_ 2004
+ni 1971
+b 1933
+ko 1894
+je_ 1700
+an 1671
+ij 1628
+no 1559
+Ä 1550
+_n 1522
+_u 1516
+re 1465
+ti 1409
+_o 1368
+en 1365
+_k 1353
+_j 1346
+_d 1341
+ja 1325
+li 1314
+ta 1309
+pr 1303
+c 1287
+ka 1269
+_je 1233
+po 1224
+ne 1221
+_i_ 1220
+ri 1198
+va 1197
+ov 1151
+od 1146
+la 1139
+sk 1132
+m_ 1124
+_pr 1120
+os 1086
+in 1060
+Å¡ 1053
+ve 1048
+oj 1035
+ma 1029
+om 1027
+og 1024
+im 1006
+av 1002
+al 982
+me 976
+vi 971
+_po 966
+_na 963
+na_ 944
+da 928
+ro 905
+nj 900
+ik 891
+_je_ 889
+to 884
+ad 881
+ar 873
+h 862
+or 858
+se 840
+_m 836
+te 819
+is 816
+_u_ 810
+aj 809
+ed 800
+_t 791
+et 772
+at 740
+vo 735
+ju 731
+gr 723
+di 722
+lo 722
+za 709
+il 709
+ak 707
+_r 704
+ja_ 703
+ji 700
+ne_ 694
+_ko 691
+ki 689
+er 681
+ci 680
+ć 673
+_se 670
+_v 664
+ž 663
+el 662
+on 658
+_z 656
+S 638
+iz 635
+bi 622
+ek 616
+_S 612
+su 607
+gra 606
+sa 603
+a, 601
+a,_ 598
+_b 598
+ih 597
+om_ 591
+_g 588
+ost 587
+ije 586
+d_ 579
+tr 574
+se_ 567
+ija 561
+de 559
+em 552
+_se_ 552
+le 549
+a. 548
+lj 548
+a._ 542
+do 540
+_su 533
+zi 529
+iÄ 525
+sta 520
+h_ 520
+ke 517
+ih_ 511
+f 507
+go 505
+ol 504
+dn 498
+sti 496
+ka_ 493
+_. 489
+_._ 473
+rad 472
+_a 468
+g_ 463
+ic 461
+as 461
+_za 461
+it 456
+koj 454
+ob 448
+iv 442
+da_ 442
+az 441
+su_ 436
+ku 433
+ma_ 430
+mo 429
+ju_ 429
+_sa 427
+ke_ 421
+ni_ 421
+ist 421
+og_ 418
+_od 417
+am 416
+anj 412
+Ä‘ 407
+_su_ 407
+ru 400
+nje 398
+sl 397
+ok 392
+op 391
+_koj 391
+_na_ 389
+tn 388
+ji_ 384
+e, 383
+_do 381
+e,_ 380
+ima 379
+aÄ 378
+nos 378
+vn 377
+B 377
+_ka 373
+ti_ 372
+li_ 370
+eo 370
+pre 367
+_iz 364
+P 361
+sko 361
+io 360
+n_ 360
+" 356
+vr 354
+_st 354
+mi 352
+Äk 351
+ao 350
+im_ 347
+es 346
+_B 346
+ev 344
+ski 343
+ez 343
+j_ 341
+ije_ 341
+ig 339
+_ra 338
+ko_ 336
+tv 336
+grad 335
+no_ 335
+la_ 334
+_P 333
+_da 333
+Å¡t 332
+od_ 330
+- 326
+dr 323
+va_ 322
+tu 320
+_l 316
+pro 315
+ori 315
+N 314
+ika 311
+ija_ 311
+sto 309
+e. 307
+ir 303
+e._ 302
+_pro 301
+_pre 300
+ki_ 300
+ot 299
+_N 297
+sv 294
+pe 291
+ns 291
+sn 291
+met 290
+t_ 289
+pri 289
+ba 288
+ili 288
+pa 288
+ut 287
+ao_ 286
+oji 285
+_ne 285
+Äe 284
+ova 283
+kom 282
+um 281
+iÄk 279
+nost 279
+k_ 279
+si 279
+ada 278
+van 278
+cij 276
+Sr 276
+lik 275
+_Sr 275
+nt 275
+ogr 274
+ug 274
+_ve 274
+ran 273
+br 273
+ani 272
+ine 272
+ac 271
+edn 271
+red 268
+_bi 266
+_pri 266
+ud 266
+ogra 265
+nja 265
+odi 264
+_f 263
+_re 262
+ga 258
+ati 258
+zn 257
+ovi 255
+rij 254
+_sv 254
+ako 252
+nu 252
+nij 251
+ana 251
+Äa 251
+rav 250
+din 248
+kr 247
+iš 247
+Äi 245
+up 245
+ce 245
+ta_ 244
+rv 244
+men 244
+un 243
+rb 243
+aju 241
+ava 241
+ra_ 241
+etn 239
+oj_ 239
+ln 238
+T 238
+pos 237
+eni 237
+M 234
+_go 233
+_od_ 232
+du 231
+ali 231
+ini 229
+ima_ 229
+_da_ 228
+nov 227
+_te 227
+ps 225
+_e 225
+Srb 223
+ca 223
+_M 223
+_Srb 222
+ara 222
+_mo 221
+Be 221
+_de 221
+i. 220
+bij 220
+K 220
+jed 219
+sa_ 219
+oji_ 218
+Än 218
+_ob 218
+pi 218
+ur 218
+eogr 217
+ove 217
+avi 217
+tno 217
+eog 217
+eogra 217
+stv 216
+zv 216
+_Be 216
+i._ 216
+nik 215
+bo 214
+_koji 214
+nic 214
+koji 214
+_pos 214
+_K 213
+ume 213
+za_ 211
+i, 211
+i,_ 211
diff --git a/libtextcat/data/new_fingerprints/lm/serbian.lm b/libtextcat/data/new_fingerprints/lm/serbian.lm
new file mode 100644
index 0000000..55b5906
--- /dev/null
+++ b/libtextcat/data/new_fingerprints/lm/serbian.lm
@@ -0,0 +1,400 @@
+_ 56294
+а 17374
+и 15500
+е 13745
+о 13087
+н 8809
+Ñ€ 8535
+Ñ 7383
+Ñ‚ 6692
+у 6390
+к 6060
+а_ 5221
+ј 5197
+в 5177
+д 4882
+е_ 4729
+м 4663
+л 4534
+п 4121
+и_ 3992
+_Ñ 2964
+г 2703
+з 2575
+у_ 2521
+_п 2491
+ра 2430
+_и 2355
+на 2337
+је 2281
+. 2169
+, 2142
+,_ 2134
+._ 2112
+ÑÑ‚ 2091
+о_ 2004
+ни 1971
+б 1933
+ко 1894
+иј 1628
+но 1559
+ч 1550
+_у 1516
+је_ 1465
+ре 1465
+_н 1437
+ти 1409
+_о 1368
+_к 1353
+_ј 1346
+_д 1315
+ли 1314
+та 1309
+пр 1303
+ц 1287
+ка 1269
+ан 1260
+_је 1233
+по 1224
+не 1221
+_и_ 1220
+ен 1198
+ри 1198
+ва 1197
+ов 1151
+од 1146
+ла 1139
+Ñк 1132
+м_ 1124
+_пр 1120
+Ð¾Ñ 1086
+ш 1053
+ве 1048
+ој 1035
+ма 1029
+ом 1027
+ин 1025
+ог 1024
+им 1006
+ав 1002
+ме 976
+ви 971
+_по 966
+_на 963
+на_ 944
+да 928
+ја 906
+ро 905
+Ñš 895
+ал 893
+ик 891
+_је_ 889
+то 884
+ад 876
+ар 873
+Ñ… 862
+ор 858
+Ñе 840
+_м 836
+те 819
+Ð¸Ñ 816
+_у_ 810
+ај 809
+ед 800
+_Ñ‚ 791
+ет 772
+ат 740
+во 735
+гр 723
+ди 722
+ло 722
+за 709
+ак 707
+_Ñ€ 704
+не_ 694
+_ко 691
+ки 689
+ер 681
+ил 681
+ци 680
+Ñ› 673
+_Ñе 670
+_в 664
+_з 656
+он 651
+С 638
+из 635
+би 622
+ж 617
+ек 616
+_С 612
+ел 611
+Ñу 607
+гра 606
+Ñа 603
+а, 601
+а,_ 598
+_б 598
+их 597
+ом_ 591
+_г 588
+оÑÑ‚ 587
+ије 586
+д_ 579
+Ñ‚Ñ€ 574
+Ñе_ 567
+ија 561
+де 559
+_Ñе_ 552
+ем 552
+ле 549
+а. 548
+Ñ™ 548
+а._ 542
+до 540
+_Ñу 533
+ју 529
+зи 529
+ји 525
+ич 525
+Ñта 520
+Ñ…_ 520
+ке 517
+их_ 511
+Ñ„ 507
+го 505
+Ñти 496
+ка_ 493
+_. 489
+_._ 473
+_а 468
+рад 467
+ја_ 467
+г_ 463
+иц 461
+Ð°Ñ 461
+_за 461
+ит 456
+кој 454
+об 448
+да_ 442
+ив 442
+аз 441
+Ñу_ 436
+ку 433
+ма_ 430
+мо 429
+_Ñа 427
+ке_ 421
+ол 421
+ни_ 421
+иÑÑ‚ 421
+дн 421
+ог_ 418
+_од 417
+ам 416
+ањ 411
+Ñ’ 407
+_Ñу_ 407
+ру 400
+ње 398
+Ñл 397
+ок 392
+оп 391
+_кој 391
+_на_ 389
+е, 383
+тн 381
+_до 381
+е,_ 380
+има 379
+Ð½Ð¾Ñ 378
+ач 378
+вн 377
+Б 377
+_ка 373
+ти_ 372
+ео 370
+ли_ 370
+пре 367
+_из 364
+Ñко 361
+ио 360
+н_ 360
+П 359
+ју_ 359
+" 356
+вр 354
+_ÑÑ‚ 354
+ји_ 354
+ми 352
+чк 351
+ао 350
+им_ 347
+_Б 346
+ÐµÑ 346
+ев 344
+Ñки 343
+ез 343
+ије_ 341
+иг 339
+_ра 338
+тв 336
+ко_ 336
+град 335
+но_ 335
+ла_ 334
+_да 333
+_П 333
+шт 332
+од_ 330
+- 326
+ј_ 326
+др 323
+ва_ 322
+ту 320
+ори 315
+про 315
+ија_ 311
+ика 311
+Ñто 309
+е. 307
+ир 303
+е._ 302
+_про 301
+_пре 300
+ки_ 300
+от 299
+Ð 296
+Ñв 294
+пе 291
+Ñн 291
+Ð½Ñ 291
+мет 290
+Ñ‚_ 289
+при 289
+ба 288
+па 288
+или 288
+ут 287
+ао_ 286
+оји 285
+_не 285
+че 284
+ова 283
+ком 282
+ум 281
+_Ð 280
+Ñи 279
+ичк 279
+ноÑÑ‚ 279
+к_ 279
+ада 278
+Ср 276
+циј 276
+лик 275
+_Ср 275
+нт 275
+огр 274
+_ве 274
+уг 274
+бр 273
+ани 272
+ине 272
+ац 271
+ред 268
+_би 266
+_при 266
+уд 265
+ња 265
+огра 265
+оди 264
+_Ñ„ 263
+_ре 262
+_л 259
+ати 258
+га 258
+зн 257
+ови 255
+риј 254
+_Ñв 254
+ну 252
+ако 252
+ча 251
+ниј 251
+ана 251
+рав 250
+иш 247
+кр 247
+чи 245
+уп 245
+це 245
+дин 244
+та_ 244
+рв 244
+рб 243
+ра_ 241
+ају 241
+ава 241
+ун 240
+ој_ 239
+Т 238
+лн 238
+Ð¿Ð¾Ñ 237
+ени 237
+етн 234
+М 234
+_го 233
+_од_ 232
+али 231
+ду 231
+ини 229
+има_ 229
+_да_ 228
+_те 227
+нов 227
+Ð¿Ñ 225
+_е 225
+_М 223
+Срб 223
+ца 223
+_Срб 222
+ара 222
+ран 221
+_мо 221
+Бе 221
+_де 221
+биј 220
+и. 220
+јед 219
+К 219
+едн 219
+Ñа_ 219
+пи 218
+оји_ 218
+ур 218
+_об 218
+ове 217
+чн 217
+тно 217
+ави 217
+еогр 217
+еогра 217
+еог 217
+и._ 216
+Ñтв 216
+зв 216
+_Бе 216
+ник 215
+_који 214
+ниц 214
+бо 214
+који 214
+_Ð¿Ð¾Ñ 214
+уме 213
+_К 212
+за_ 211
+и,_ 211
+и, 211
+тра 209
+Ñп 209
diff --git a/libtextcat/data/new_fingerprints/lm/serbian_ascii.lm b/libtextcat/data/new_fingerprints/lm/serbian_ascii.lm
deleted file mode 100644
index 9471be6..0000000
--- a/libtextcat/data/new_fingerprints/lm/serbian_ascii.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_ 34122
-a 9113
-o 8135
-i 7736
-e 7535
-n 5207
-s 4860
-j 3995
-t 3797
-r 3660
-u 3224
-l 3065
-d 3061
-e_ 2941
-v 2786
-a_ 2746
-k 2701
-m 2492
-o_ 2328
-y 2238
-p 2151
-_s 2148
-i_ 2094
-je 1887
-c 1854
-z 1731
-_n 1437
-_p 1432
-g 1418
-b 1368
-u_ 1333
-je_ 1237
-, 1226
-,_ 1214
-_i 1130
-st 1105
-na 1076
-. 1056
-_d 1033
-._ 1030
-_j 967
-ra 934
-ko 908
-ni 900
-cy 893
-sy 875
-_je 871
-_o 824
-ta 799
-no 780
-_u 777
-re 766
-_b 764
-_k 763
-da 760
-ne 754
-li 750
-ti 745
-se 722
-po 713
-to 713
-_je_ 696
-an 688
-ja 683
-pr 665
-va 651
-lo 634
-_z 626
-m_ 625
-is 625
-il 622
-ov 621
-la 621
-_m 615
-bi 604
-_t 603
-_po 594
-en 586
-_se 578
-os 578
-in 576
-od 576
-ka 552
-ve 548
-ij 538
-_pr 536
-al 536
-vo 535
-om 530
-_i_ 525
-nj 515
-ed 509
-_na 507
-na_ 503
-og 499
-oj 498
-ma 493
-_bi 492
-on 489
-ak 482
-im 481
-ye 481
-ro 480
-vi 473
-sa 469
-ri 464
-da_ 451
-av 450
-at 449
-se_ 447
-es 446
-h 443
-ao 441
-ji 437
-yi 436
-_da 433
-ad 432
-_se_ 430
-lj 428
-zy 426
-za 426
-_ne 425
-de 422
-tr 417
-cj 415
-_u_ 414
-_c 412
-le 402
-_v 397
-ar 390
-_g 390
-ic 384
-n_ 382
-ju 379
-lo_ 377
-aj 376
-_ko 369
-ao_ 366
-ek 361
-_da_ 359
-et 356
-go 354
-iz 346
-_za 345
-_r 344
-or 342
-mo 341
-el 340
-as 339
-ik 336
-te 332
-_sa 329
-d_ 323
-am 320
-me 318
-sto 317
-di 315
-ec 311
-ol 310
-a,_ 307
-a, 307
-_ni 302
-ya 296
-do 295
-yt 294
-su 292
-syt 289
-li_ 288
-sta 286
-ije 284
-ko_ 277
-ti_ 277
-la_ 277
-ga 276
-bil 275
-no_ 274
-a. 273
-nu 272
-a._ 271
-ne_ 271
-om_ 268
-_cy 266
-_na_ 263
-_bil 263
-sv 263
-ru 259
-to_ 256
-_od 253
-cyi 253
-nje 251
-it 251
-pa 250
-az 248
-e,_ 245
-e, 245
-ob 244
-dn 243
-ac 242
-ost 242
-k_ 240
-iv 239
-io 238
-_su 238
-_iz 237
-ilo 235
-_sv 234
-_ka 233
-koj 231
-mi 229
-im_ 229
-ije_ 227
-g_ 226
-em 223
-su_ 223
-ih 223
-ji_ 221
-kr 220
-ut 220
-_koj 220
-V 218
-_st 218
-ye_ 217
-_l 214
-_V 213
-ovo 211
-j_ 210
-uc 208
-ja_ 208
-h_ 207
-nij 206
-sk 206
-ot 203
-io_ 203
-gl 203
-_do 201
-ok 200
-ns 199
-ilo_ 199
-er 197
-ih_ 195
-pre 193
-ci 193
-og_ 193
-ki 192
-sl 191
-t_ 189
-ni_ 189
-_a 189
-vr 188
-ati 187
-_su_ 186
-nije 181
-pro 181
-be 180
-yn 179
-cye 178
-ju_ 178
-ku 177
-isy 177
-ta_ 174
-sye 172
-_tr 172
-O 172
-jen 172
-_to 171
-pi 168
-_pre 168
-S 168
-ima 167
-nije_ 167
-_mo 166
-eg 166
-e._ 164
-za_ 164
-e. 164
-_pro 164
-gov 163
-N 162
-dr 162
-ako 162
-tv 162
-_S 160
-P 159
-ma_ 159
-_on 159
-sp 158
-nst 158
-anj 158
-dj 157
-oc 157
-_sy 156
-ev 155
-ce 155
-lik 154
-_nij 153
-_N 152
-ist 151
-_P 151
-_nije 151
-- 151
-ba 150
-jed 150
-sti 150
-ova 149
-_is 148
-id 148
-ton 148
-ke 147
-pos 147
-od_ 147
-osy 146
-Vi 146
-ila 145
-ins 145
-bo 145
-_Vi 145
-ir 144
-_za_ 144
-oz 144
-ecj 144
-cje 143
-on_ 143
-zn 142
-_O 141
-us 141
-i, 141
-i,_ 141
-mu 140
-inst 140
-cya 140
-oji 139
-esy 139
-icy 139
-lja 138
-_go 138
-i. 138
-_re 137
-_bilo 137
-edn 137
-acy 137
-rat 137
-bilo 137
-ali 136
-ecy 136
-ija 135
-pri 135
-ad_ 135
-lic 135
-i._ 135
-Vins 134
-Vin 134
-ston 134
-Vinst 134
-ga_ 134
-nston 134
-insto 134
-nsto 134
-_Vins 133
-_Vin 133
-zi 132
-ran 131
-le_ 130
-ili 130
-bilo_ 130
-_pos 129
-ila_ 129
-est 128
-_ve 128
-tre 128
-zye 127
-_nj 127
-si 126
-f 126
-alo 125
-ako_ 125
-tra 125
-sa_ 125
-pu 124
-ud 124
-z_ 124
-_ra 124
-iti 124
-_de 124
-odi 123
-T 123
--_ 122
-o,_ 121
-o, 121
-du 121
-rs 121
-B 120
-ka_ 119
-red 119
-_od_ 118
-an_ 118
-nu_ 118
-iko 117
-dno 117
-_pa 117
-s_ 116
commit ed748b75b999292fe89ebda6cc4d6ab72c043d8c
Merge: 52a5bab... 1c4f1f8...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Tue Nov 9 15:15:30 2010 +0100
dr77: rebase to DEV300m92
commit 1c4f1f84466535a06c7b165c24aafdbb6efa1426
Merge: d027632... 2a4938f...
Author: Mathias Bauer <mba at openoffice.org>
Date: Thu Oct 21 15:10:42 2010 +0200
CWS changehid: resync to m90
commit 2a4938f3a03f03f42133c1b90452a32230ab6e99
Merge: 734400b... cc90a71...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu Oct 14 12:52:12 2010 +0200
#i10000# changes from OOO330 m10
commit d02763289fbc2fba6d00fddbc6a7cf204f75d620
Merge: a4f1d66... 734400b...
Author: Mathias Bauer <mba at openoffice.org>
Date: Sat Oct 9 18:56:58 2010 +0200
CWS changehid: resync to m89
commit 734400b65669c2f8dc67f4c3b4595f1e9654e26d
Merge: aa48aac... bb65563...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Fri Oct 1 16:02:03 2010 +0200
#i10000#
commit bb65563e8f9c37ebb2f3e4e8253969bacc50d87b
Merge: 4937ec4... 2e1cccd...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Fri Oct 1 15:00:03 2010 +0200
CWS-TOOLING: integrate CWS ause123
commit 024ce1710818bdd9550dde0a870f43bf6637e139
Author: Joachim Lingner <jl at openoffice.org>
Date: Thu Sep 30 14:26:35 2010 +0200
jl160 #i114782# make libxmlsec buildable with older lixml2 versions
diff --git a/libxmlsec/xmlsec1-olderlibxml2.patch b/libxmlsec/xmlsec1-olderlibxml2.patch
index b5f3d57..f2bd85f 100644
--- a/libxmlsec/xmlsec1-olderlibxml2.patch
+++ b/libxmlsec/xmlsec1-olderlibxml2.patch
@@ -4,7 +4,7 @@
return(0);
}
-+#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20706
++#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20704
+/*
+ * xmlC14NMode:
+ *
commit 52a5bab935a7eb9afdf3fc5c8c4a18b1ce87b073
Merge: fbcb22e... aa48aac...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Tue Sep 28 20:30:05 2010 +0200
dr77: rebase to DEV300_m88
commit 4937ec4682da913507c86167693fa5ab5725c7f0
Merge: 88cfef0... 81feca9...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Tue Sep 28 17:07:12 2010 +0200
CWS-TOOLING: integrate CWS sb126
commit 88cfef0431958d2eff1f1ea77df116540fed30e4
Merge: aa48aac... 05bb611...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Tue Sep 28 16:59:46 2010 +0200
#i10000# changes from OOO330 m9
commit 2e1cccdac4e61761da0b7dd897d24772cc9f90ee
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Tue Sep 28 16:20:49 2010 +0200
ause123: #163579# cleanup baseline usage
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index e1dae4a..0301405 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -63,7 +63,4 @@ SHL1LIBS= $(SLB)$/eggtray.lib
# --- Targets ----------------------------------
.ENDIF # L10N_framework
-.IF "$(OS)$(CPU)" == "LINUXX"
-EXTRALIBPATHS+=-L$(LIBRARY_PATH)
-.ENDIF # "$(OS)$(CPU)" == "LINUXX"
.INCLUDE : target.mk
commit a83808c2f6a28dd16caead42b545b98f6f8a711e
Merge: ff1ad8a... aa48aac...
Author: Joachim Lingner <jl at openoffice.org>
Date: Tue Sep 28 16:14:42 2010 +0200
jl160 merge with DEV300_m88
commit 81feca999f6c355e2e9d801f8d4b16d800796492
Merge: f3e49a9... aa48aac...
Author: sb <sb at openoffice.org>
Date: Wed Sep 22 13:37:40 2010 +0200
sb126: merged in DEV300_m88
commit f3e49a920dd592e71f0c09193355486d2dc8b4bc
Author: sb <sb at openoffice.org>
Date: Mon Sep 20 10:53:39 2010 +0200
sb126: #i110197# fixed merge conflict
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 7fc92f6..449ebce 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -10,16 +10,16 @@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
---- misc/openssl-0.9.8l/Makefile.org 2009-03-03 23:40:29.000000000 +0100
-+++ misc/build/openssl-0.9.8l/Makefile.org 2010-06-21 11:11:03.787119295 +0200
-@@ -198,7 +198,7 @@
+--- misc/build/openssl-0.9.8o/Makefile.org 2010-01-27 17:06:36.000000000 +0100
++++ misc/build/openssl-0.9.8o/Makefile.org 2010-09-20 09:24:00.000000000 +0100
+@@ -199,7 +199,7 @@
BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
CC='${CC}' CFLAG='${CFLAG}' \
- AS='${CC}' ASFLAG='${CFLAG} -c' \
+ AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \
AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
- SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \
+ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \
INSTALL_PREFIX='${INSTALL_PREFIX}' \
--- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
+++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
commit aa48aaccb56723bbbc066260f25380fb95360119
Merge: ff1ad8a... 9b2fc2c...
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Fri Sep 17 14:17:32 2010 +0200
CWS-TOOLING: integrate CWS cmcfixes78
commit ef89d6469438b347d1e77d0ba8a1e3745aac9618
Merge: e5d0d71... ff1ad8a...
Author: sb <sb at openoffice.org>
Date: Thu Sep 16 16:45:57 2010 +0200
sb126: merged in DEV300_m87
diff --cc openssl/openssllnx.patch
index 5d8f823,abd1006..7fc92f6
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@@ -10,50 -10,8 +10,19 @@@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+--- misc/openssl-0.9.8l/Makefile.org 2009-03-03 23:40:29.000000000 +0100
++++ misc/build/openssl-0.9.8l/Makefile.org 2010-06-21 11:11:03.787119295 +0200
+@@ -198,7 +198,7 @@
+
+ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
+ CC='${CC}' CFLAG='${CFLAG}' \
+- AS='${CC}' ASFLAG='${CFLAG} -c' \
++ AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \
+ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
+ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \
+ INSTALL_PREFIX='${INSTALL_PREFIX}' \
- --- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
- +++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
- @@ -408,7 +408,7 @@
- LIBRARIES="$(LIBCRYPTO)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
- - CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- + CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
- @@ -421,7 +421,7 @@
- fi; \
- [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
- - CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- + CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
- --- misc/openssl-0.9.8l/apps/Makefile 2008-11-19 17:03:48.000000000 +0100
- +++ misc/build/openssl-0.9.8l/apps/Makefile 2009-03-30 12:50:56.332719825 +0200
- @@ -158,7 +158,7 @@
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
- - CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- + CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- -(cd ..; \
- --- misc/openssl-0.9.8l/config 2009-02-16 09:43:41.000000000 +0100
- +++ misc/build/openssl-0.9.8l/config 2009-03-30 08:59:09.588448000 +0200
+ --- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
+ +++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
commit 9b2fc2c9a101f82da81d207bc153b46045536174
Author: Caolán McNamara <cmc at openoffice.org>
Date: Mon Sep 6 12:25:37 2010 +0100
cmcfixes78: #i114344# fix up this odd LINUXX pointless looking thing
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index e1dae4a..3bc9b80 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -63,7 +63,7 @@ SHL1LIBS= $(SLB)$/eggtray.lib
# --- Targets ----------------------------------
.ENDIF # L10N_framework
-.IF "$(OS)$(CPU)" == "LINUXX"
+.IF "$(OS)$(CPU)" == "LINUXX" && "$(LIBRARY_PATH)" != ""
EXTRALIBPATHS+=-L$(LIBRARY_PATH)
.ENDIF # "$(OS)$(CPU)" == "LINUXX"
.INCLUDE : target.mk
commit ba25398c99de0ed22db7df2a2b778035db27f64b
Author: Caolán McNamara <cmc at openoffice.org>
Date: Mon Sep 6 11:42:50 2010 +0100
cmcfixes78: #i114344# WaE
diff --git a/libegg/source/eggtrayicon.c b/libegg/source/eggtrayicon.c
index 7207b5f..9c68113 100644
--- a/libegg/source/eggtrayicon.c
+++ b/libegg/source/eggtrayicon.c
@@ -230,10 +230,11 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_
{
EggTrayIcon *icon = user_data;
XEvent *xev = (XEvent *)xevent;
+ (void)event;
if (xev->xany.type == ClientMessage &&
xev->xclient.message_type == icon->manager_atom &&
- xev->xclient.data.l[1] == icon->selection_atom)
+ (Atom)(xev->xclient.data.l[1]) == icon->selection_atom)
{
egg_tray_icon_update_manager_window (icon, TRUE);
}
@@ -383,6 +384,7 @@ egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
static gboolean
transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
{
+ (void)user_data;
gdk_window_clear_area (widget->window, event->area.x, event->area.y,
event->area.width, event->area.height);
return FALSE;
@@ -392,6 +394,8 @@ static void
make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
gpointer user_data)
{
+ (void)previous_style;
+ (void)user_data;
gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
}
@@ -401,6 +405,7 @@ make_transparent (GtkWidget *widget, gpointer user_data)
if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
return;
+ (void)user_data;
gtk_widget_set_app_paintable (widget, TRUE);
gtk_widget_set_double_buffered (widget, FALSE);
gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
commit fbcb22e5c59c4e65da58261c3eba7e5fac2c27f2
Merge: 0380c67... ff1ad8a...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Mon Aug 30 19:25:43 2010 +0200
dr77: rebase to DEV300m87
commit b3f09adb3c2d83ceb3f04c52e18e9492278dfe3f
Merge: be51803... ff1ad8a...
Author: Caolán McNamara <cmc at openoffice.org>
Date: Mon Aug 30 15:20:46 2010 +0100
cmcfixes78: merge with DEV300 m87
commit ff1ad8a1106e2fa20440ab5f46048fb985a466fc
Merge: be51803... 63cc7cf...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Aug 25 17:13:00 2010 +0200
CWS-TOOLING: integrate CWS cmcfixes77
commit 0380c677085234ebc5babe94a45516a2d0357482
Merge: a40bdc3... be51803...
Author: Daniel Rentz <dr at openoffice.org>
Date: Thu Aug 5 09:51:16 2010 +0200
dr77: rebase to m86
commit 63cc7cfc1f713e47dc24f8267d154c3d723ba091
Merge: 3c542ce... be51803...
Author: Caolán McNamara <cmc at openoffice.org>
Date: Tue Aug 3 10:25:58 2010 +0100
cmcfixes77: merge with DEV300 m86
commit be518033480492f213b99e8c9b974f7336f90028
Merge: ba216e2... de3f7e0...
Author: obo <obo at openoffice.org>
Date: Thu Jul 29 13:49:01 2010 +0200
CWS-TOOLING: integrate CWS ause124
commit ba216e25107dfcafc8e9919ba2780851c55cf0ec
Merge: 5c91e71... 99d0523...
Author: obo <obo at openoffice.org>
Date: Thu Jul 29 09:00:46 2010 +0200
CWS-TOOLING: integrate CWS unxlngxnewbaseline
commit 5c91e713c1c538ee79545b52ba3c560f6bcd94bc
Merge: 89a101d... d37c350...
Author: obo <obo at openoffice.org>
Date: Thu Jul 29 08:11:42 2010 +0200
Integrate OOO330_m2 into DEV300 (merge)
commit 99d0523948839a37e50307c0d9ae556311411f74
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Fri Jul 23 14:43:01 2010 +0200
unxlngxnewbaseline: #162926# use another condition to determine build environment
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index 3e8cbce..e1dae4a 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -63,7 +63,7 @@ SHL1LIBS= $(SLB)$/eggtray.lib
# --- Targets ----------------------------------
.ENDIF # L10N_framework
-.IF "$(HOSTTYPE)" == "x86_64-linux"
+.IF "$(OS)$(CPU)" == "LINUXX"
EXTRALIBPATHS+=-L$(LIBRARY_PATH)
-.ENDIF # "$(HOSTTYPE)" == "x86_64-linux"
+.ENDIF # "$(OS)$(CPU)" == "LINUXX"
.INCLUDE : target.mk
commit a4f1d66dae5b14179e90df0d5c7f19f23613492d
Merge: 5b6f368... 89a101d...
Author: Mathias Bauer <mba at openoffice.org>
Date: Thu Jul 22 10:55:12 2010 +0200
CWS changehid: resync to m85
commit 123ef79e981bc39a2e9ff8d4312c623aa77ecad0
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Jul 21 17:14:43 2010 +0200
#162926# some fixes for 64 bit linux baseline
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index 0301405..3e8cbce 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -63,4 +63,7 @@ SHL1LIBS= $(SLB)$/eggtray.lib
# --- Targets ----------------------------------
.ENDIF # L10N_framework
+.IF "$(HOSTTYPE)" == "x86_64-linux"
+EXTRALIBPATHS+=-L$(LIBRARY_PATH)
+.ENDIF # "$(HOSTTYPE)" == "x86_64-linux"
.INCLUDE : target.mk
commit de3f7e0f7540fcbf9081a2988fc0ca2e483e0991
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Tue Jul 20 12:46:55 2010 +0200
#i107097# - pass MAXPROCESS to GNU make in external modules
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index f50f4aa..9441e92 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -97,7 +97,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
@@ -172,7 +172,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index f1aa380..b733398 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -74,7 +74,7 @@ BUILD_ACTION=make hyph_en_US.dic
@all:
echo "Nothing to do here."
.ELSE
-BUILD_ACTION=make && make check
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
OUT2INC += hyphen.h
.ENDIF
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 9b7ea1b..d0f0483 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -102,7 +102,7 @@ CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozi
.IF "$(SYSTEM_MOZILLA)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
CONFIGURE_DIR=win32
@@ -166,7 +166,7 @@ CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=n
.IF "$(SYSTEM_MOZILLA)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ENDIF
commit 3c542ceffaa75fe48d30cbf635cb133183cb5e9a
Author: Caolán McNamara <cmc at openoffice.org>
Date: Fri Jul 16 14:44:32 2010 +0100
cmcfixes77: #i80021# system libtextcat
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 01a2a6e..f14a69b 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -30,6 +30,12 @@ PRJ=.
PRJNAME=libtextcat
TARGET=libtextcat
+.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
+all:
+ @echo "An already available installation of libtextcat should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
commit 5b6f368464d1eba0569f2905f2f7c80ff928b3a3
Merge: d3ab33e... a40bdc3...
Author: Mathias Bauer <mba at openoffice.org>
Date: Tue Jul 13 14:38:37 2010 +0200
CWS changehid: resync to m84
commit 89a101df780e7513ca8e4e66fbcdfeb82a799bb6
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Sat Jul 10 20:20:31 2010 +0100
cmcfixes76: #i113076# missing includes in configure test
diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch
index 943ac98..f2f5f4e 100644
--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
@@ -590,6 +590,15 @@
if test "z$dir" = "z/usr/lib" ; then
NSS_LIBS="$NSS_LIBS_LIST"
else
+@@ -13166,7 +13284,7 @@
+
+ if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$NSS_CFLAGS"
++ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
@@ -15036,7 +15154,7 @@
# values after options handling.
ac_log="
@@ -734,6 +743,15 @@
dnl do not add -L/usr/lib because compiler does it anyway
if test "z$dir" = "z/usr/lib" ; then
NSS_LIBS="$NSS_LIBS_LIST"
+@@ -738,7 +761,7 @@
+
+ if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$NSS_CFLAGS"
++ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
+ AC_EGREP_CPP(yes,[
+ #include <nss.h>
+ #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
--- misc/xmlsec1-1.2.14/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2009-10-01 10:28:50.997747312 +0200
@@ -376,7 +376,7 @@
commit e5d0d710a6efff556e154c869e3db55b8605c5a3
Merge: a8eead3... a40bdc3...
Author: sb <sb at openoffice.org>
Date: Wed Jun 30 15:38:26 2010 +0200
sb126: merged in DEV300_m84
commit a8eead33fe4fa4c8ef0dc7d28f78edf6dfcacad4
Author: sb <sb at openoffice.org>
Date: Tue Jun 22 09:31:32 2010 +0200
sb126: #i110197# remove -Wl,-z,noexecstack hack
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 1f0e597..2c25909 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -143,10 +143,6 @@ xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
-.IF "$(OS)$(COM)"=="LINUXGCC"
-xmlsec_LDFLAGS+=-Wl,-z,noexecstack
-.ENDIF
-
LDFLAGS:=$(xmlsec_LDFLAGS)
.EXPORT: LDFLAGS
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 7f26b99..5d8f823 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -10,6 +10,17 @@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+--- misc/openssl-0.9.8l/Makefile.org 2009-03-03 23:40:29.000000000 +0100
++++ misc/build/openssl-0.9.8l/Makefile.org 2010-06-21 11:11:03.787119295 +0200
+@@ -198,7 +198,7 @@
+
+ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
+ CC='${CC}' CFLAG='${CFLAG}' \
+- AS='${CC}' ASFLAG='${CFLAG} -c' \
++ AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \
+ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
+ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \
+ INSTALL_PREFIX='${INSTALL_PREFIX}' \
--- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
+++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
@@ -408,7 +408,7 @@
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 1375ae8..fb110e4 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -93,7 +93,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
.ELSE # "WNT"
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="SOLARISC52"
LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index d48b7af..4cf7668 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
.ELSE # "WNT"
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="SOLARISC52"
LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index d6acd4d..02770cb 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/librdf
.ELSE # "WNT"
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="SOLARISC52"
LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
commit 6119a551efabfea3b90003bbf5bd91e80fcc6d36
Author: sb <sb at openoffice.org>
Date: Mon Jun 21 17:14:15 2010 +0200
sb126: #i111141# patch the file that is actually used
diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch
index cecd69a..ee8d5ed 100644
--- a/cppunit/ldflags.patch
+++ b/cppunit/ldflags.patch
@@ -1,10 +1,11 @@
---- misc/cppunit-1.12.1/src/cppunit/Makefile.am Wed Feb 20 06:36:38 2008
-+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am Mon May 3 17:00:41 2010
-@@ -63,5 +63,6 @@
+--- misc/cppunit-1.12.1/src/cppunit/Makefile.in 2008-02-20 06:59:55.000000000 +0100
++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in 2010-06-21 17:01:38.324370072 +0200
+@@ -300,7 +300,7 @@
- libcppunit_la_LDFLAGS= \
+ libcppunit_la_LDFLAGS = \
-no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) \
-+ @LIBADD_DL@
++ -release $(LT_RELEASE) $(LIBADD_DL)
+
+ all: all-am
More information about the Libreoffice-commits
mailing list