diff options
79 files changed, 1598 insertions, 1529 deletions
@@ -2,12 +2,19 @@ *~ .*.sw[op] +.gitattributes + # the build directories /*/unxlng?? /*/unxlng??.pro -/*/wntmsci?? -/*/wntmsci??.pro +/*/wntmsc??? +/*/wntmsc???.pro +/*/unxmac?? +/*/unxmac??.pro /external/*/*.dll +/external/*/*.txt /external/msi/*.exe /external/msv*/*.manifest +/external/vcredist/vcredist_x64.exe +/external/vcredist/vcredist_x86.exe 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 diff --git a/cppunit/avoid-synthetised-destructor.patch b/cppunit/avoid-synthetised-destructor.patch new file mode 100644 index 0000000..82b7929 --- /dev/null +++ b/cppunit/avoid-synthetised-destructor.patch @@ -0,0 +1,29 @@ +rhbz#641350 impl. destructor of CppUnit::Message causes segfault when test +is built with debug. STL + +diff -up cppunit-1.12.1/include/cppunit/Message.h.dt cppunit-1.12.1/include/cppunit/Message.h +--- misc/build/cppunit-1.12.1/include/cppunit/Message.h.dt 2010-10-08 14:02:26.514477964 +0200 ++++ misc/build/cppunit-1.12.1/include/cppunit/Message.h 2010-10-08 14:02:15.411948098 +0200 +@@ -57,6 +57,8 @@ public: + const std::string &detail2, + const std::string &detail3 ); + ++ ~Message(); ++ + Message &operator =( const Message &other ); + + /*! \brief Returns the short description. +diff -up cppunit-1.12.1/src/cppunit/Message.cpp.dt cppunit-1.12.1/src/cppunit/Message.cpp +--- misc/build/cppunit-1.12.1/src/cppunit/Message.cpp.dt 2010-10-08 14:02:39.421768852 +0200 ++++ misc/build/cppunit-1.12.1/src/cppunit/Message.cpp 2010-10-08 14:02:54.066829633 +0200 +@@ -47,6 +47,10 @@ Message::Message( const std::string &sho + addDetail( detail1, detail2, detail3 ); + } + ++Message::~Message() ++{ ++} ++ + Message & + Message::operator =( const Message &other ) + { 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 diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 26e6845..a842e42 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ # cppunit-1.12.1.tar.gz/download> -PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch +PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912590&group_id=11795&atid=311795> # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& @@ -75,35 +75,23 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk EXTRA_CFLAGS += -mthreads LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2 -.IF "$(USE_SYSTEM_STL)" != "YES" - -OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl -.IF "$(USE_STLP_DEBUG)" == "TRUE" -OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG -.END -OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) - -OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR) -OOO_STLPORT_LIBS = $(LIBSTLPORT) - -.END - CONFIGURE_ACTION = ./configure CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ 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 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 @@ -114,47 +102,6 @@ OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ .ELSE -.IF "$(USE_SYSTEM_STL)" != "YES" - -OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl -.IF "$(USE_STLP_DEBUG)" == "TRUE" -OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG -.END -.IF "$(COM)" == "GCC" -OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -.END - -OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR) -OOO_STLPORT_LIBS = $(LIBSTLPORT) - -# When "checking for C compiler default output file name" configure -# unfortunately uses "$CC $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS" to build -# a C program that links against $(LIBSTLPORT); at least on one unxlngi6 -# machine, this has been observed to fail with "/lib/libm.so.6: undefined -# reference to `_rtld_global_ro@GLIBC_PRIVATE'" unless -lm is also specified: -.IF "$(OS)" == "LINUX" && "$(COM)" == "GCC" && "$(CPU)" == "I" -OOO_STLPORT_LIBS += -lm -# #i112124# furthermore, STLPort seems to require libstdc++ -OOO_STLPORT_LIBS += -lstdc++ -.END - -# And later, when "checking whether the C compiler works" configure tries to -# execute that program; however, the program would fail to locate the STLport -# library (another work-around might be to add something like --as-needed around -# $(LIBSTLPORT)): -.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" || "$(OS)" == "OPENBSD" -.IF "$(LD_LIBRARY_PATH)" == "" -LD_LIBRARY_PATH := $(SOLARLIBDIR) - # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment - # variable is set to the empty string -.ELSE -LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(SOLARLIBDIR) -.END -.EXPORT: LD_LIBRARY_PATH -.END - -.END - # At least on Solaris with Sun CC, linking the cppunit dynamic library fails as # TestAssert.o uses fabs but -lm is missing from the command line (cppunit's # aclocal.m4 contains an unused AC_CHECK_LIBM, maybe using that would be a @@ -168,11 +115,11 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ 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 diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst index 9bfcb57..2178f59 100644 --- a/cppunit/prj/build.lst +++ b/cppunit/prj/build.lst @@ -1,2 +1,2 @@ -c5t cppunit : stlport NULL +c5t cppunit : soltools NULL c5t cppunit nmake - all cppunit NULL diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index 3e30ad2..29dac2b 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 diff --git a/cppunit/windows.patch b/cppunit/windows.patch index da34692..fdd7607 100644 --- a/cppunit/windows.patch +++ b/cppunit/windows.patch @@ -1,12 +1,36 @@ --- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:25.084658287 +0100 +++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:18.660706180 +0100 -@@ -149,6 +149,9 @@ - #define NOMINMAX - #define BLENDFUNCTION void // for mingw & gcc - #include <windows.h> -+#if defined(OPTIONAL) // set within windows.h -+#undef OPTIONAL -+#endif - #endif +@@ -133,9 +133,8 @@ + /*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN() + * \brief Implements the 'main' function for the plug-in. + * +- * This macros implements the main() function for dynamic library. +- * For example, WIN32 requires a DllMain function, while some Unix +- * requires a main() function. This macros takes care of the implementation. ++ * This macro implements the main() function for dynamic library ++ * on Unix for some weird reason. + */ + + // Win32 +@@ -149,21 +149,7 @@ + + // Win32 + #if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER) +-#if !defined(APIENTRY) +-#define WIN32_LEAN_AND_MEAN +-#define NOGDI +-#define NOUSER +-#define NOKERNEL +-#define NOSOUND +-#define NOMINMAX +-#define BLENDFUNCTION void // for mingw & gcc +-#include <windows.h> +-#endif #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ - BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \ +- BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \ +- { \ +- return TRUE; \ +- } \ + typedef char __CppUnitPlugInImplementMainDummyTypeDef + + // Unix diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index dd84b53..0b18d2c 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -46,6 +46,7 @@ $(MINGWGXXDLL) : .IF "$(OS)"!="FREEBSD" .IF "$(OS)"!="NETBSD" .IF "$(OS)"!="OPENBSD" +.IF "$(OS)"!="DRAGONFLY" .EXPORT : CC @@ -75,6 +76,7 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) : .ENDIF .ENDIF .ENDIF +.ENDIF .ENDIF .ENDIF diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk index 04e2ff5..f7a3b1e 100644 --- a/external/glibc/makefile.mk +++ b/external/glibc/makefile.mk @@ -47,7 +47,6 @@ ADDITIONAL_FILES += posix$/readdir_r.c PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch -#CONFIGURE_DIR=glibc-2.1.3/posix CONFIGURE_ACTION= BUILD_DIR=posix diff --git a/external/msi/readme.txt b/external/msi/readme.txt deleted file mode 100644 index 1242ea1..0000000 --- a/external/msi/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -Copy instmsia.exe and instmsiw.exe in this directory for Windows builds using -a .NET compiler. These programs are part of the .NET installation and can be -found in a directory similar to: -"c:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\Deployment\MsiRedist\" diff --git a/external/msvcp70/README_msvcp70.dll b/external/msvcp70/README_msvcp70.dll deleted file mode 100644 index ebc854b..0000000 --- a/external/msvcp70/README_msvcp70.dll +++ /dev/null @@ -1,4 +0,0 @@ -Put the msvcp70.dll and msvcr70.dll in this directory for Windows builds using a .NET compiler. -The dll is part of the .NET installation and can be found in a directory similar -to: -"c:\Program Files\Microsoft Visual Studio .NET\Visual C++ .NET Professional - English\" diff --git a/external/msvcp71/README_msvcX71.dll b/external/msvcp71/README_msvcX71.dll deleted file mode 100644 index 54197f4..0000000 --- a/external/msvcp71/README_msvcX71.dll +++ /dev/null @@ -1,6 +0,0 @@ -Put the msvcp71.dll and msvcr71.dll in this directory for Windows builds using -a .NET compiler. The dlls are part of the .NET2003 installation and can be found -in a directory similar to: -"c:\Program Files\Microsoft Visual Studio .NET 2003\Visual C++ .NET Professional - English\" -If you use the --enable-dbgutil switch during configure, copy the appropriate msvcp71d.dll and -msvcr71d.dll into this directory. diff --git a/external/prj/d.lst b/external/prj/d.lst index e4d61b6..7809c07 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -27,12 +27,6 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys ..\gdiplus\gdiplus.dll %_DEST%\bin%_EXT%\gdiplus.dll -..\msvcp70\msvcp70.dll %_DEST%\bin%_EXT%\msvcp70.dll -..\msvcp70\msvcr70.dll %_DEST%\bin%_EXT%\msvcr70.dll - -..\msvcp71\msvcp71*.dll %_DEST%\bin%_EXT% -..\msvcp71\msvcr71*.dll %_DEST%\bin%_EXT% - ..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT% ..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT% ..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT% @@ -46,12 +40,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys ..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.DebugCRT.manifest ..\msm90\*.msm %_DEST%\bin%_EXT% -..\unicows\unicows.dll %_DEST%\bin%_EXT%\unicows.dll - ..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll -..\msi\instmsiw.exe %_DEST%\bin%_EXT%\instmsiw.exe - ..\vcredist\vcredist_x86.exe %_DEST%\bin%_EXT%\vcredist_x86.exe ..\vcredist\vcredist_x64.exe %_DEST%\bin%_EXT%\vcredist_x64.exe diff --git a/external/unicows/README_unicows.dll b/external/unicows/README_unicows.dll deleted file mode 100644 index 7f5a7e0..0000000 --- a/external/unicows/README_unicows.dll +++ /dev/null @@ -1 +0,0 @@ -Put the unicows.dll in this directory for Windows builds. diff --git a/hsqldb/prj/build.lst b/hsqldb/prj/build.lst index a7c0623..a7c0623 100755..100644 --- a/hsqldb/prj/build.lst +++ b/hsqldb/prj/build.lst diff --git a/hsqldb/prj/d.lst b/hsqldb/prj/d.lst index 8801f4f..8801f4f 100755..100644 --- a/hsqldb/prj/d.lst +++ b/hsqldb/prj/d.lst diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch deleted file mode 100644 index 50c859b..0000000 --- a/hyphen/hyphen-2.4.patch +++ /dev/null @@ -1,176 +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 ---- misc/hyphen-2.4/tests/test.sh Wed Apr 30 14:12:33 2008 -+++ misc/build/hyphen-2.4/tests/test.sh Fri Nov 5 09:05:16 2010 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - - function check_valgrind_log () { - if [ "$VALGRIND" != "" ]; then 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/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 f1aa380..94c1592 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -36,12 +36,14 @@ 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 \ + hyphen-2.7.1-read-charset.patch .IF "$(GUI)"=="UNX" CONFIGURE_DIR=$(BUILD_DIR) @@ -74,7 +76,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/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 diff --git a/icc/SampleICC-1.3.2-fmtargs.patch b/icc/SampleICC-1.3.2-fmtargs.patch new file mode 100644 index 0000000..a7549a8 --- /dev/null +++ b/icc/SampleICC-1.3.2-fmtargs.patch @@ -0,0 +1,20 @@ +--- misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp 2009-01-20 11:48:36.000000000 -0500 ++++ misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp 2009-01-19 14:41:23.000000000 -0500 +@@ -1155,7 +1155,7 @@ + + CIccInfo Info; + icChar buf[128]; +- sprintf(buf, Info.GetSigName(m_Header.deviceClass)); ++ sprintf(buf, "%s", Info.GetSigName(m_Header.deviceClass)); + if (m_Header.deviceClass!=icSigInputClass && m_Header.deviceClass!=icSigDisplayClass) { + if (GetTag(icSigGrayTRCTag) || GetTag(icSigRedTRCTag) || GetTag(icSigGreenTRCTag) || + GetTag(icSigBlueTRCTag) || GetTag(icSigRedColorantTag) || GetTag(icSigGreenColorantTag) || +@@ -1230,7 +1230,7 @@ + for (i=m_Tags->begin(); i!=m_Tags->end(); i++) { + tagsig = i->TagInfo.sig; + typesig = i->pTag->GetType(); +- sprintf(buf, Info.GetSigName(tagsig)); ++ sprintf(buf, "%s", Info.GetSigName(tagsig)); + if (!IsTypeValid(tagsig, typesig)) { + sReport += icValidateNonCompliantMsg; + sReport += buf; diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch index 581b8e3..3371520 100644 --- a/icc/SampleICC-1.3.2.patch +++ b/icc/SampleICC-1.3.2.patch @@ -1373,6 +1373,22 @@ *** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h Mon Aug 20 22:05:00 2007 --- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h Fri Jan 25 14:23:09 2008 *************** +*** 87,93 **** + #endif + + //PC, visual C++ +! #if defined(_MSC_VER) && !defined(__MWERKS__) && defined(_M_IX86) + + //Define how 64 bit integers are represented + #define ICCUINT64 unsigned __int64 +--- 87,93 ---- + #endif + + //PC, visual C++ +! #if defined(_MSC_VER) && !defined(__MWERKS__) + + //Define how 64 bit integers are represented + #define ICCUINT64 unsigned __int64 *** 107,126 **** #else // non-PC, perhaps Mac or Linux @@ -1586,7 +1602,7 @@ default: sReport += icValidateWarningMsg; -! sprintf(buf, " - %s: Unregisterd CMM signature.\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId)); +! sprintf(buf, " - %s: Unregistered CMM signature.\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId)); sReport += buf; rv = icMaxStatus(rv, icValidateWarning); } diff --git a/icc/makefile.mk b/icc/makefile.mk index 87ebf3a..4bbde85 100644 --- a/icc/makefile.mk +++ b/icc/makefile.mk @@ -38,7 +38,9 @@ TARGET=icc TARFILE_NAME=SampleICC-1.3.2 TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab -PATCH_FILES=$(TARFILE_NAME).patch +PATCH_FILES= \ + $(TARFILE_NAME).patch \ + $(TARFILE_NAME)-fmtargs.patch CONVERTFILES= \ IccProfLib$/IccTagProfSeqId.h \ diff --git a/icc/prj/build.lst b/icc/prj/build.lst index 9eace5d..e9bf65b 100644 --- a/icc/prj/build.lst +++ b/icc/prj/build.lst @@ -1,3 +1,3 @@ -ip icc : solenv stlport external sal NULL +ip icc : solenv external sal NULL ip icc usr1 - all ip_mkout NULL ip icc nmake - all ip_icc NULL diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp index 20a8c7c..00454f6 100644 --- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp +++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp @@ -252,14 +252,14 @@ void dumpProfile(FILE *outfile, const char * profileName) int n; TagEntryList::iterator i; - for (n=0, i=pIcc->m_Tags->begin(); i!=pIcc->m_Tags->end(); i++, n++) + for (n=0, i=pIcc->m_Tags->begin(); i!=pIcc->m_Tags->end(); ++i, ++n) { fprintf(outfile,"%25s %s %8ld\t%8ld\n", Fmt.GetTagSigName(i->TagInfo.sig), icGetSig(buf, i->TagInfo.sig, false), i->TagInfo.offset, i->TagInfo.size); } - for (n=0, i=pIcc->m_Tags->begin(); i!=pIcc->m_Tags->end(); i++, n++) + for (n=0, i=pIcc->m_Tags->begin(); i!=pIcc->m_Tags->end(); ++i, ++n) dumpTag(outfile, pIcc, i->TagInfo.sig); } delete pIcc; diff --git a/libegg/README b/libegg/README deleted file mode 100644 index d1c4d46..0000000 --- a/libegg/README +++ /dev/null @@ -1,7 +0,0 @@ -This is a fragment of libegg - an experimental library of code for cut/paste into -various applications. The canonical version can be found at: -http://cvs.gnome.org/viewcvs/libegg/ - -however - this functionality is included in (newer) gtk+ versions in the core -toolkit, so eventually this module will be deprecated and die in favour of -that code. diff --git a/libegg/inc/eggtrayicon.h b/libegg/inc/eggtrayicon.h deleted file mode 100644 index 759a631..0000000 --- a/libegg/inc/eggtrayicon.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* eggtrayicon.h - * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EGG_TRAY_ICON_H__ -#define __EGG_TRAY_ICON_H__ - -#include <glib.h> - -G_BEGIN_DECLS - -typedef struct _EggTrayIcon EggTrayIcon; - -EggTrayIcon *egg_tray_icon_new (const gchar *name); -void egg_tray_icon_cancel_message (EggTrayIcon *icon, - guint id); -G_END_DECLS - -#endif /* __EGG_TRAY_ICON_H__ */ diff --git a/libegg/prj/build.lst b/libegg/prj/build.lst deleted file mode 100644 index f9d2c7b..0000000 --- a/libegg/prj/build.lst +++ /dev/null @@ -1,2 +0,0 @@ -eg libegg : soltools stlport NULL -eg libegg\source nmake - u eg_src NULL diff --git a/libegg/prj/d.lst b/libegg/prj/d.lst deleted file mode 100644 index ae77cb2..0000000 --- a/libegg/prj/d.lst +++ /dev/null @@ -1,5 +0,0 @@ -mkdir: %_DEST%\inc%_EXT%\eggtray - -..\inc\eggtrayicon.h %_DEST%\inc%_EXT%\eggtray\eggtrayicon.h - -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* diff --git a/libegg/source/eggtrayicon-impl.h b/libegg/source/eggtrayicon-impl.h deleted file mode 100644 index 36af985..0000000 --- a/libegg/source/eggtrayicon-impl.h +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* eggtrayicon.h - * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EGG_TRAY_ICON_IMPL_H__ -#define __EGG_TRAY_ICON_IMPL_H__ - -#include <gtk/gtkplug.h> -#ifdef GDK_WINDOWING_X11 -#include <gdk/gdkx.h> -#endif -#include <eggtrayicon.h> - -G_BEGIN_DECLS - -#define EGG_TYPE_TRAY_ICON (egg_tray_icon_get_type ()) -#define EGG_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon)) -#define EGG_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) -#define EGG_IS_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON)) -#define EGG_IS_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON)) -#define EGG_TRAY_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) - -typedef struct _EggTrayIconClass EggTrayIconClass; - -struct _EggTrayIcon -{ - GtkPlug parent_instance; - - guint stamp; - -#ifdef GDK_WINDOWING_X11 - Atom selection_atom; - Atom manager_atom; - Atom system_tray_opcode_atom; - Atom orientation_atom; - Window manager_window; -#endif - GtkOrientation orientation; -}; - -struct _EggTrayIconClass -{ - GtkPlugClass parent_class; -}; - -GType egg_tray_icon_get_type (void); - -EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen *screen, - const gchar *name); - -guint egg_tray_icon_send_message (EggTrayIcon *icon, - gint timeout, - const char *message, - gint len); - -GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon); - -G_END_DECLS - -#endif /* __EGG_TRAY_ICON_IMPL_H__ */ diff --git a/libegg/source/eggtrayicon.c b/libegg/source/eggtrayicon.c deleted file mode 100644 index 9c68113..0000000 --- a/libegg/source/eggtrayicon.c +++ /dev/null @@ -1,573 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* eggtrayicon.c - * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include <string.h> -#include <libintl.h> - -#include "eggtrayicon-impl.h" - -#include <gdkconfig.h> -#if defined (GDK_WINDOWING_X11) -#include <gdk/gdkx.h> -#include <X11/Xatom.h> -#elif defined (GDK_WINDOWING_WIN32) -#include <gdk/gdkwin32.h> -#endif - -#define EGG_COMPILATION -#ifndef EGG_COMPILATION -#ifndef _ -#define _(x) dgettext (GETTEXT_PACKAGE, x) -#define N_(x) x -#endif -#else -#define _(x) x -#define N_(x) x -#endif - -#define SYSTEM_TRAY_REQUEST_DOCK 0 -#define SYSTEM_TRAY_BEGIN_MESSAGE 1 -#define SYSTEM_TRAY_CANCEL_MESSAGE 2 - -#define SYSTEM_TRAY_ORIENTATION_HORZ 0 -#define SYSTEM_TRAY_ORIENTATION_VERT 1 - -enum { - PROP_0, - PROP_ORIENTATION -}; - -static GtkPlugClass *parent_class = NULL; - -static void egg_tray_icon_init (EggTrayIcon *icon); -static void egg_tray_icon_class_init (EggTrayIconClass *klass); - -static void egg_tray_icon_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - -static void egg_tray_icon_realize (GtkWidget *widget); -static void egg_tray_icon_unrealize (GtkWidget *widget); - -static void egg_tray_icon_add (GtkContainer *container, - GtkWidget *widget); - -#ifdef GDK_WINDOWING_X11 -static void egg_tray_icon_update_manager_window (EggTrayIcon *icon, - gboolean dock_if_realized); -static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon); -#endif - -/* - * This is made somewhat more 'interesting' by the facts that: - * a) GTypePlugin is a foul & tangled mess - * b) We may have been unloaded, and left an invalid - * EggTrayIcon class lying around in the GType database, - * we could use GTypePlugin to fix this, but see a) - - * this is far easier and simpler. - */ -GType -egg_tray_icon_get_type (void) -{ - static GType our_type = 0; - - if (our_type == 0) - { - static const GTypeInfo our_info = - { - sizeof (EggTrayIconClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (EggTrayIcon), - 0, /* n_preallocs */ - (GInstanceInitFunc) NULL, /* instance_init */ - NULL - }; - - our_type = g_type_from_name ("EggTrayIcon"); - if (!our_type) - our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0); - } - - /* always overwrite the function pointers */ - egg_tray_icon_class_init (g_type_class_ref (our_type)); - - return our_type; -} - -static void -egg_tray_icon_init (EggTrayIcon *icon) -{ - icon->stamp = 1; - icon->orientation = GTK_ORIENTATION_HORIZONTAL; - - gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); -} - -static void -egg_tray_icon_class_init (EggTrayIconClass *klass) -{ - GObjectClass *gobject_class = (GObjectClass *)klass; - GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; - GtkContainerClass *container_class = (GtkContainerClass *)klass; - - parent_class = g_type_class_peek_parent (klass); - - gobject_class->get_property = egg_tray_icon_get_property; - - widget_class->realize = egg_tray_icon_realize; - widget_class->unrealize = egg_tray_icon_unrealize; - - container_class->add = egg_tray_icon_add; - - if (!g_object_class_find_property (gobject_class, "orientation")) - g_object_class_install_property (gobject_class, - PROP_ORIENTATION, - g_param_spec_enum ("orientation", - "Orientation", - "The orientation of the tray.", - GTK_TYPE_ORIENTATION, - GTK_ORIENTATION_HORIZONTAL, - G_PARAM_READABLE)); -} - -static void -egg_tray_icon_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - EggTrayIcon *icon = EGG_TRAY_ICON (object); - - switch (prop_id) - { - case PROP_ORIENTATION: - g_value_set_enum (value, icon->orientation); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -#ifdef GDK_WINDOWING_X11 - -static void -egg_tray_icon_get_orientation_property (EggTrayIcon *icon) -{ - Display *xdisplay; - Atom type; - int format; - union { - gulong *prop; - guchar *prop_ch; - } prop = { NULL }; - gulong nitems; - gulong bytes_after; - int error, result; - - g_assert (icon->manager_window != None); - - xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - gdk_error_trap_push (); - type = None; - result = XGetWindowProperty (xdisplay, - icon->manager_window, - icon->orientation_atom, - 0, G_MAXLONG, FALSE, - XA_CARDINAL, - &type, &format, &nitems, - &bytes_after, &(prop.prop_ch)); - error = gdk_error_trap_pop (); - - if (error || result != Success) - return; - - if (type == XA_CARDINAL) - { - GtkOrientation orientation; - - orientation = (prop.prop [0] == SYSTEM_TRAY_ORIENTATION_HORZ) ? - GTK_ORIENTATION_HORIZONTAL : - GTK_ORIENTATION_VERTICAL; - - if (icon->orientation != orientation) - { - icon->orientation = orientation; - - g_object_notify (G_OBJECT (icon), "orientation"); - } - } - - if (prop.prop) - XFree (prop.prop); -} - -static GdkFilterReturn -egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data) -{ - EggTrayIcon *icon = user_data; - XEvent *xev = (XEvent *)xevent; - (void)event; - - if (xev->xany.type == ClientMessage && - xev->xclient.message_type == icon->manager_atom && - (Atom)(xev->xclient.data.l[1]) == icon->selection_atom) - { - egg_tray_icon_update_manager_window (icon, TRUE); - } - else if (xev->xany.window == icon->manager_window) - { - if (xev->xany.type == PropertyNotify && - xev->xproperty.atom == icon->orientation_atom) - { - egg_tray_icon_get_orientation_property (icon); - } - if (xev->xany.type == DestroyNotify) - { - egg_tray_icon_manager_window_destroyed (icon); - } - } - return GDK_FILTER_CONTINUE; -} - -#endif - -static void -egg_tray_icon_unrealize (GtkWidget *widget) -{ -#ifdef GDK_WINDOWING_X11 - EggTrayIcon *icon = EGG_TRAY_ICON (widget); - GdkWindow *root_window; - - if (icon->manager_window != None) - { - GdkWindow *gdkwin; - - gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); - } - - root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget)); - - gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon); - - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); -#endif -} - -#ifdef GDK_WINDOWING_X11 - -static void -egg_tray_icon_send_manager_message (EggTrayIcon *icon, - long message, - Window window, - long data1, - long data2, - long data3) -{ - XClientMessageEvent ev; - Display *display; - - ev.type = ClientMessage; - ev.window = window; - ev.message_type = icon->system_tray_opcode_atom; - ev.format = 32; - ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window); - ev.data.l[1] = message; - ev.data.l[2] = data1; - ev.data.l[3] = data2; - ev.data.l[4] = data3; - - display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - gdk_error_trap_push (); - XSendEvent (display, - icon->manager_window, False, NoEventMask, (XEvent *)&ev); - XSync (display, False); - gdk_error_trap_pop (); -} - -static void -egg_tray_icon_send_dock_request (EggTrayIcon *icon) -{ - egg_tray_icon_send_manager_message (icon, - SYSTEM_TRAY_REQUEST_DOCK, - icon->manager_window, - gtk_plug_get_id (GTK_PLUG (icon)), - 0, 0); -} - -static void -egg_tray_icon_update_manager_window (EggTrayIcon *icon, - gboolean dock_if_realized) -{ - Display *xdisplay; - - if (icon->manager_window != None) - return; - - xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - XGrabServer (xdisplay); - - icon->manager_window = XGetSelectionOwner (xdisplay, - icon->selection_atom); - - if (icon->manager_window != None) - XSelectInput (xdisplay, - icon->manager_window, StructureNotifyMask|PropertyChangeMask); - - XUngrabServer (xdisplay); - XFlush (xdisplay); - - if (icon->manager_window != None) - { - GdkWindow *gdkwin; - - gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon); - - if (dock_if_realized && GTK_WIDGET_REALIZED (icon)) - egg_tray_icon_send_dock_request (icon); - - egg_tray_icon_get_orientation_property (icon); - } -} - -static void -egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon) -{ - GdkWindow *gdkwin; - - g_return_if_fail (icon->manager_window != None); - - gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); - - icon->manager_window = None; - - egg_tray_icon_update_manager_window (icon, TRUE); -} - -#endif - -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; -} - -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); -} - -static void -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); - g_signal_connect (widget, "expose_event", - G_CALLBACK (transparent_expose_event), NULL); - g_signal_connect_after (widget, "style_set", - G_CALLBACK (make_transparent_again), NULL); -} - -static void -egg_tray_icon_realize (GtkWidget *widget) -{ -#ifdef GDK_WINDOWING_X11 - EggTrayIcon *icon = EGG_TRAY_ICON (widget); - GdkScreen *screen; - GdkDisplay *display; - Display *xdisplay; - char buffer[256]; - GdkWindow *root_window; - - if (GTK_WIDGET_CLASS (parent_class)->realize) - GTK_WIDGET_CLASS (parent_class)->realize (widget); - - make_transparent (widget, NULL); - - screen = gtk_widget_get_screen (widget); - display = gdk_screen_get_display (screen); - xdisplay = gdk_x11_display_get_xdisplay (display); - - /* Now see if there's a manager window around */ - g_snprintf (buffer, sizeof (buffer), - "_NET_SYSTEM_TRAY_S%d", - gdk_screen_get_number (screen)); - - icon->selection_atom = XInternAtom (xdisplay, buffer, False); - - icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False); - - icon->system_tray_opcode_atom = XInternAtom (xdisplay, - "_NET_SYSTEM_TRAY_OPCODE", - False); - - icon->orientation_atom = XInternAtom (xdisplay, - "_NET_SYSTEM_TRAY_ORIENTATION", - False); - - egg_tray_icon_update_manager_window (icon, FALSE); - egg_tray_icon_send_dock_request (icon); - - root_window = gdk_screen_get_root_window (screen); - - /* Add a root window filter so that we get changes on MANAGER */ - gdk_window_add_filter (root_window, - egg_tray_icon_manager_filter, icon); -#endif -} - -static void -egg_tray_icon_add (GtkContainer *container, GtkWidget *widget) -{ - g_signal_connect (widget, "realize", - G_CALLBACK (make_transparent), NULL); - GTK_CONTAINER_CLASS (parent_class)->add (container, widget); -} - -EggTrayIcon * -egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name) -{ - g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); - - return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL); -} - -EggTrayIcon* -egg_tray_icon_new (const gchar *name) -{ - EggTrayIcon *icon = g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL); - egg_tray_icon_init (icon); - return icon; -} - -guint -egg_tray_icon_send_message (EggTrayIcon *icon, - gint timeout, - const gchar *message, - gint len) -{ - guint stamp; - - g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0); - g_return_val_if_fail (timeout >= 0, 0); - g_return_val_if_fail (message != NULL, 0); - -#ifdef GDK_WINDOWING_X11 - if (icon->manager_window == None) - return 0; -#endif - - if (len < 0) - len = strlen (message); - - stamp = icon->stamp++; - -#ifdef GDK_WINDOWING_X11 - /* Get ready to send the message */ - egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE, - (Window)gtk_plug_get_id (GTK_PLUG (icon)), - timeout, len, stamp); - - /* Now to send the actual message */ - gdk_error_trap_push (); - while (len > 0) - { - XClientMessageEvent ev; - Display *xdisplay; - - xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - ev.type = ClientMessage; - ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon)); - ev.format = 8; - ev.message_type = XInternAtom (xdisplay, - "_NET_SYSTEM_TRAY_MESSAGE_DATA", False); - if (len > 20) - { - memcpy (&ev.data, message, 20); - len -= 20; - message += 20; - } - else - { - memcpy (&ev.data, message, len); - len = 0; - } - - XSendEvent (xdisplay, - icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev); - XSync (xdisplay, False); - } - gdk_error_trap_pop (); -#endif - - return stamp; -} - -void -egg_tray_icon_cancel_message (EggTrayIcon *icon, - guint id) -{ - g_return_if_fail (EGG_IS_TRAY_ICON (icon)); - g_return_if_fail (id > 0); -#ifdef GDK_WINDOWING_X11 - egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE, - (Window)gtk_plug_get_id (GTK_PLUG (icon)), - id, 0, 0); -#endif -} - -GtkOrientation -egg_tray_icon_get_orientation (EggTrayIcon *icon) -{ - g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), GTK_ORIENTATION_HORIZONTAL); - - return icon->orientation; -} diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk deleted file mode 100644 index 0301405..0000000 --- a/libegg/source/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# 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=libegg -TARGET=eggtray -TARGETTYPE=GUI - -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE -C_RESTRICTIONFLAGS*=-xc99=no_lib - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -.IF "$(ENABLE_GTK)"!="" - -PKGCONFIG_MODULES=gtk+-2.0 gdk-2.0 -.INCLUDE: pkg_config.mk -CFLAGS+=$(PKGCONFIG_CFLAGS) - -# --- Files ------------------------------------- - -SLOFILES=\ - $(SLO)$/eggtrayicon.obj - -SHL1STDLIBS+=$(PKGCONFIG_LIBS) $(X11LINK_DYNAMIC) -.IF "$(PKGCONFIG_ROOT)"!="" -SHL1SONAME+=-z nodefs -SHL1NOCHECK=TRUE -.ENDIF # "$(PKGCONFIG_ROOT)"!="" - - -SHL1TARGET= eggtray$(DLLPOSTFIX) -SHL1LIBS= $(SLB)$/eggtray.lib - -.ENDIF # "$(ENABLE_GTK)"!="" - -# --- Targets ---------------------------------- -.ENDIF # L10N_framework -.INCLUDE : target.mk 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 diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index 526c23c..83a1e42 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -32,8 +32,8 @@ 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." + @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 ----------------------------------------------------- @@ -58,8 +58,6 @@ ADDITIONAL_FILES= \ src$/libtextcat.map .IF "$(GUI)"=="UNX" -#CONFIGURE_DIR=$(BUILD_DIR) - #relative to CONFIGURE_DIR CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst index da155db..8516375 100644 --- a/libtextcat/prj/build.lst +++ b/libtextcat/prj/build.lst @@ -1,3 +1,3 @@ -ltc libtextcat : stlport soltools solenv NULL +ltc libtextcat : soltools solenv NULL ltc libtextcat usr1 - all ltc_mkout NULL ltc libtextcat nmake - all ltc_libtextcat NULL diff --git a/libwpd/libwpd.corruptedprefix.patch b/libwpd/libwpd.corruptedprefix.patch new file mode 100644 index 0000000..9d5288d --- /dev/null +++ b/libwpd/libwpd.corruptedprefix.patch @@ -0,0 +1,107 @@ +--- misc/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp 2010-08-26 13:35:21.000000000 +0200 ++++ misc/build/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp 2011-04-01 18:25:41.328379372 +0200 +@@ -46,45 +46,67 @@ + } + + WP6PrefixDataPacket * WP6PrefixDataPacket::constructPrefixDataPacket(WPXInputStream * input, WPXEncryption *encryption, WP6PrefixIndice *prefixIndice) +-{ +- switch (prefixIndice->getType()) ++{ ++ WP6PrefixDataPacket *tmpPacket = 0; ++ try ++ { ++ switch (prefixIndice->getType()) ++ { ++ case WP6_INDEX_HEADER_INITIAL_FONT: ++ tmpPacket = new WP6DefaultInitialFontPacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_GENERAL_WORDPERFECT_TEXT: ++ tmpPacket = new WP6GeneralTextPacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_DESIRED_FONT_DESCRIPTOR_POOL: ++ tmpPacket = new WP6FontDescriptorPacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_FILL_STYLE: ++ tmpPacket = new WP6FillStylePacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY: ++ tmpPacket = new WP6ExtendedDocumentSummaryPacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_OUTLINE_STYLE: ++ tmpPacket = new WP6OutlineStylePacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_GRAPHICS_FILENAME: ++ tmpPacket = new WP6GraphicsFilenamePacket(input, encryption, prefixIndice->getID(), prefixIndice->getFlags(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_GRAPHICS_CACHED_FILE_DATA: ++ tmpPacket = new WP6GraphicsCachedFileDataPacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_GRAPHICS_BOX_STYLE: ++ tmpPacket = new WP6GraphicsBoxStylePacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_TABLE_STYLE: ++ tmpPacket = new WP6TableStylePacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ case WP6_INDEX_HEADER_COMMENT_ANNOTATION: ++ tmpPacket = new WP6CommentAnnotationPacket(input, encryption, prefixIndice->getID(), ++ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); ++ break; ++ default: ++ break;; ++ } ++ } ++ catch (FileException) + { +- case WP6_INDEX_HEADER_INITIAL_FONT: +- return new WP6DefaultInitialFontPacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_GENERAL_WORDPERFECT_TEXT: +- return new WP6GeneralTextPacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_DESIRED_FONT_DESCRIPTOR_POOL: +- return new WP6FontDescriptorPacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_FILL_STYLE: +- return new WP6FillStylePacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY: +- return new WP6ExtendedDocumentSummaryPacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_OUTLINE_STYLE: +- return new WP6OutlineStylePacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_GRAPHICS_FILENAME: +- return new WP6GraphicsFilenamePacket(input, encryption, prefixIndice->getID(), prefixIndice->getFlags(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_GRAPHICS_CACHED_FILE_DATA: +- return new WP6GraphicsCachedFileDataPacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_GRAPHICS_BOX_STYLE: +- return new WP6GraphicsBoxStylePacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_TABLE_STYLE: +- return new WP6TableStylePacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- case WP6_INDEX_HEADER_COMMENT_ANNOTATION: +- return new WP6CommentAnnotationPacket(input, encryption, prefixIndice->getID(), +- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); +- default: +- return 0; ++ if (tmpPacket) ++ delete tmpPacket; ++ tmpPacket = 0; + } ++ return tmpPacket; + } + + void WP6PrefixDataPacket::_read(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataOffset, uint32_t dataSize) diff --git a/libwpd/libwpd.gcc460.patch b/libwpd/libwpd.gcc460.patch new file mode 100644 index 0000000..e5e41a0 --- /dev/null +++ b/libwpd/libwpd.gcc460.patch @@ -0,0 +1,11 @@ +--- misc/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h 2011-01-24 09:50:48.131106590 +0000 ++++ misc/build/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h 2011-01-24 09:51:17.676174074 +0000 +@@ -37,7 +37,7 @@ + ~WP5GraphicsInformationPacket(); + void _readContents(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataSize); + const std::vector<WPXBinaryData *> &getImages() const { return m_images; } +- const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return NULL; } ++ const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return 0; } + + private: + std::vector<WPXBinaryData *> m_images; diff --git a/libwpd/libwpd.warnings.patch b/libwpd/libwpd.warnings.patch new file mode 100644 index 0000000..ebc86dc --- /dev/null +++ b/libwpd/libwpd.warnings.patch @@ -0,0 +1,32 @@ +--- misc/libwpd-0.9.1/src/lib/libwpd_internal.cpp ++++ misc/build/libwpd-0.9.1/src/lib/libwpd_internal.cpp +@@ -998,21 +998,25 @@ _WPXColumnProperties::_WPXColumnProperties() + // HACK: this function is really cheesey + int _extractNumericValueFromRoman(const char romanChar) + { ++ int retValue = 0; + switch (romanChar) + { + case 'I': + case 'i': +- return 1; ++ retValue = 1; ++ break; + case 'V': + case 'v': +- return 5; ++ retValue = 5; ++ break; + case 'X': + case 'x': +- return 10; ++ retValue = 10; ++ break; + default: + throw ParseException(); + } +- return 1; ++ return retValue; + } + + // _extractDisplayReferenceNumberFromBuf: given a nuWP6_DEFAULT_FONT_SIZEmber string in UCS2 represented diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk index 6ea63b1..6ecbbfa 100644 --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -43,6 +43,9 @@ TARGET=wpd TARFILE_NAME=libwpd-0.9.1 TARFILE_MD5=5ff846847dab351604ad859e2fd4ed3c +PATCH_FILES=libwpd.gcc460.patch \ + libwpd.corruptedprefix.patch \ + libwpd.warnings.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/libwpd/prj/build.lst b/libwpd/prj/build.lst index 7e5ae5c..1da425b 100644 --- a/libwpd/prj/build.lst +++ b/libwpd/prj/build.lst @@ -1,3 +1,3 @@ -lw libwpd : soltools stlport NULL +lw libwpd : soltools NULL lw libwpd usr1 - all lw_mkout NULL lw libwpd nmake - all lw_libwpd NULL diff --git a/libwps/libwps-0.2.0.patch b/libwps/libwps-0.2.0.patch new file mode 100644 index 0000000..6af2989 --- /dev/null +++ b/libwps/libwps-0.2.0.patch @@ -0,0 +1,11 @@ +diff -up misc/build/libwps-0.2.0/src/lib/libwps_internal.h.old misc/build/libwps-0.2.0/src/lib/libwps_internal.h +--- misc/build/libwps-0.2.0/src/lib/libwps_internal.h.old 2010-11-17 20:47:23.288507198 +0100 ++++ misc/build/libwps-0.2.0/src/lib/libwps_internal.h 2010-11-17 20:47:26.596839807 +0100 +@@ -23,6 +23,7 @@ + #define LIBWPS_INTERNAL_H + #ifdef DEBUG + #include <bitset> ++#include <stdio.h> + #endif + #include <libwpd-stream/libwpd-stream.h> + #include <libwpd/libwpd.h> diff --git a/libwps/makefile.mk b/libwps/makefile.mk index 0a8bd6a..3f9667b 100644 --- a/libwps/makefile.mk +++ b/libwps/makefile.mk @@ -54,6 +54,8 @@ TARFILE_MD5=9e436bff44c60dc8b97cba0c7fc11a5c BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src/lib +PATCH_FILES=libwps-0.2.0.patch + # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index ffa92f5..58fc9b9 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -67,7 +67,8 @@ PATCH_FILES=\ xmlsec1-noverify.patch \ xmlsec1-mingw32.patch \ xmlsec1-mingw-keymgr-mscrypto.patch \ - xmlsec1-vc10.patch + xmlsec1-vc10.patch \ + xmlsec1-1.2.14_fix_extern_c.patch ADDITIONAL_FILES= \ include$/xmlsec$/mscrypto$/akmngr.h \ @@ -81,9 +82,6 @@ ADDITIONAL_FILES= \ .IF "$(GUI)"=="WNT" CRYPTOLIB=mscrypto -#CRYPTOLIB=nss -#BASEINC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla;$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla$/nspr;$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla$/nss;$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/external -#BASELIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) .ELSE CRYPTOLIB=nss .ENDIF @@ -96,7 +94,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 @@ -105,7 +103,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 @@ -146,10 +144,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 @@ -169,7 +163,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 diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst index a4faaa8..a52eb09 100644 --- a/libxmlsec/prj/build.lst +++ b/libxmlsec/prj/build.lst @@ -1,3 +1,3 @@ -ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL +ls libxmlsec : soltools LIBXML2:libxml2 MOZ:moz NULL ls libxmlsec usr1 - all ls_mkout NULL ls libxmlsec nmake - all ls_xmlsec1 NULL diff --git a/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch b/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch new file mode 100644 index 0000000..f5bbf5e --- /dev/null +++ b/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch @@ -0,0 +1,23 @@ +--- misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL 2009-12-05 15:19:18.000000000 -0600 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h 2011-02-13 03:09:42.917240245 -0600 +@@ -11,16 +11,16 @@ + #ifndef __XMLSEC_H__ + #define __XMLSEC_H__ + +-#ifdef __cplusplus +-extern "C" { +-#endif /* __cplusplus */ +- + #include <libxml/tree.h> + + #include <xmlsec/version.h> + #include <xmlsec/exports.h> + #include <xmlsec/strings.h> + ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ + /*********************************************************************** + * + * Basic types to make ports to exotic platforms easier 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: + * diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 7046064..9eb0120 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -63,7 +63,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/lucene/long_path.patch b/lucene/long_path.patch new file mode 100644 index 0000000..d3ab8e3 --- /dev/null +++ b/lucene/long_path.patch @@ -0,0 +1,37 @@ +--- misc/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java 2008-05-01 22:27:58.000000000 +0200 ++++ misc/build/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java 2011-02-23 16:36:26.249515000 +0100 +@@ -165,7 +165,15 @@ + public static FSDirectory getDirectory(File file, LockFactory lockFactory) + throws IOException + { +- file = new File(file.getCanonicalPath()); ++ String path = file.getPath(); ++ //File.getCanonicalPath fails on Windows with long path names ++ //Tested with Java SE 6u23 ++ //Long path names created by osl_getSystemPathFromFileURL are already ++ //unique because its implementation replaces the occurrences of .. and . ++ //That is using the com.sun.star.help.HelpIndexer service from c++ is ++ //relatively safe. ++ if (!path.startsWith("\\\\?\\")) ++ file = new File(file.getCanonicalPath()); + + if (file.exists() && !file.isDirectory()) + throw new IOException(file + " not a directory"); +@@ -455,7 +463,16 @@ + public String getLockID() { + String dirName; // name to be hashed + try { +- dirName = directory.getCanonicalPath(); ++ //File.getCanonicalPath fails on Windows with long path names ++ //Tested with Java SE 6u23 ++ //Long path names created by osl_getSystemPathFromFileURL are already ++ //unique because its implementation replaces the occurrences of .. and . ++ //That is using the com.sun.star.help.HelpIndexer service from c++ is ++ //relatively safe. ++ if (!directory.getPath().startsWith("\\\\?\\")) ++ dirName = directory.getCanonicalPath(); ++ else ++ dirName = directory.getPath(); + } catch (IOException e) { + throw new RuntimeException(e.toString(), e); + } diff --git a/lucene/makefile.mk b/lucene/makefile.mk index 3ce8f05..98fab3f 100644 --- a/lucene/makefile.mk +++ b/lucene/makefile.mk @@ -50,7 +50,12 @@ LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar TARFILE_NAME=$(LUCENE_NAME) TARFILE_MD5=48d8169acc35f97e05d8dcdfd45be7f2 -PATCH_FILES=lucene.patch +PATCH_FILES=lucene.patch + +.IF "$(OS)" == "WNT" +PATCH_FILES+= long_path.patch +.ENDIF + BUILD_DIR=. BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml diff --git a/mdds/makefile.mk b/mdds/makefile.mk index ea89676..ed8f18b 100644 --- a/mdds/makefile.mk +++ b/mdds/makefile.mk @@ -36,8 +36,8 @@ TARGET=mdds # --- Files -------------------------------------------------------- -TARFILE_NAME=mdds_0.3.0 -TARFILE_MD5=cf8a6967f7de535ae257fa411c98eb88 +TARFILE_NAME=mdds_0.5.2 +TARFILE_MD5=7a0dcb3fe1e8c7229ab4fb868b7325e6 PATCH_FILES= CONFIGURE_DIR= @@ -59,7 +59,7 @@ NORMALIZE_FLAG_FILE=so_normalized_$(TARGET) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) -@$(MKDIRHIER) $(INCCOM) - @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/inc$/mdds $(INCCOM) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/include$/mdds $(INCCOM) @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst index 65cafee..9c4dd58 100644 --- a/mdds/prj/d.lst +++ b/mdds/prj/d.lst @@ -1,5 +1,7 @@ mkdir: %_DEST%\inc%_EXT%\mdds +mkdir: %_DEST%\inc%_EXT%\mdds\hash_container ..\%__SRC%\inc\mdds\* %_DEST%\inc%_EXT%\mdds +..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc%_EXT%\mdds\hash_container diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk index 9fe9c64..e047ea0 100644 --- a/mysqlcppconn/makefile.mk +++ b/mysqlcppconn/makefile.mk @@ -6,10 +6,6 @@ # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.22 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -53,8 +49,19 @@ ADDITIONAL_FILES=\ CONVERTFILES=\ cppconn$/build_config.h +# distro-specific builds want to link against a particular mysql library +# then they do not require mysql-devel package at runtime +# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate patch +# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql library +.IF "$(SYSTEM_MYSQL)" == "YES" +MYSQL_BINDING=static +.ELSE +MYSQL_BINDING=dynamic +.ENDIF + PATCH_FILES=\ $(TARFILE_NAME).patch \ + mysql-connector-cpp-mysql-binding-$(MYSQL_BINDING).patch \ patches/default_to_protocol_tcp.patch BUILD_DIR=driver diff --git a/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch b/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch new file mode 100644 index 0000000..7007c3d --- /dev/null +++ b/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch @@ -0,0 +1,6 @@ +--- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:17:23.640625000 +0200 ++++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:13:50.359375000 +0200 +@@ -1 +1,2 @@ +-dummy ++#define HAVE_DLFCN_H 1 ++//#define MYSQLCLIENT_STATIC_BINDING 1 diff --git a/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch b/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch new file mode 100644 index 0000000..b7edeb9 --- /dev/null +++ b/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch @@ -0,0 +1,6 @@ +--- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:17:23.640625000 +0200 ++++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:13:50.359375000 +0200 +@@ -1 +1,2 @@ +-dummy ++#define HAVE_DLFCN_H 1 ++#define MYSQLCLIENT_STATIC_BINDING 1 diff --git a/mysqlcppconn/mysql-connector-cpp.patch b/mysqlcppconn/mysql-connector-cpp.patch index b710504..0575653 100644 --- a/mysqlcppconn/mysql-connector-cpp.patch +++ b/mysqlcppconn/mysql-connector-cpp.patch @@ -350,12 +350,6 @@ #include <stack> #include "mysql_util.h" ---- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:17:23.640625000 +0200 -+++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:13:50.359375000 +0200 -@@ -1 +1,2 @@ --dummy -+#define HAVE_DLFCN_H 1 -+//#define MYSQLCLIENT_STATIC_BINDING 1 --- misc/mysql-connector-cpp/driver/nativeapi/makefile.mk 2009-08-17 21:32:53.694119382 +0200 +++ misc/build/mysql-connector-cpp/driver/nativeapi/makefile.mk 2009-08-17 21:32:50.534346360 +0200 @@ -1 +1,23 @@ diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/mozsrc/jri_md.h index 0bc2e90..f02dcf0 100644 --- a/np_sdk/mozsrc/jri_md.h +++ b/np_sdk/mozsrc/jri_md.h @@ -208,16 +208,7 @@ typedef juint jsize; #ifdef HAVE_LONG_LONG -#ifdef OSF1 - -/* long is default 64-bit on OSF1, -std1 does not allow long long */ -typedef long jlong; -typedef unsigned long julong; -#define jlong_MAXINT 0x7fffffffffffffffL -#define jlong_MININT 0x8000000000000000L -#define jlong_ZERO 0x0L - -#elif (defined(WIN32) || defined(_WIN32)) +#if (defined(WIN32) || defined(_WIN32)) typedef LONGLONG jlong; typedef DWORDLONG julong; diff --git a/np_sdk/prj/build.lst b/np_sdk/prj/build.lst index 7aa9a6d..9617879 100644 --- a/np_sdk/prj/build.lst +++ b/np_sdk/prj/build.lst @@ -1,3 +1,3 @@ -np np_sdk : soltools stlport NULL +np np_sdk : soltools NULL np np_sdk usr1 - all np_sdk NULL np np_sdk\mozsrc nmake - all np_mozsrc NULL diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 9bd5d50..aff765f 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -152,8 +152,13 @@ OUT2BIN += out/libeay32.dll #CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure CONFIGURE_ACTION=$(PERL) configure - CONFIGURE_FLAGS=VC-WIN32 no-idea - BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak +.IF "$(CPU)" == "I" + OPENSSL_PLATFORM=VC-WIN32 +.ELSE + OPENSSL_PLATFORM=VC-WIN64A +.ENDIF + CONFIGURE_FLAGS=$(OPENSSL_PLATFORM) no-idea + BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL))) $(OPENSSL_PLATFORM)" && nmake -f ms/ntdll.mak OUT2LIB = out32dll$/ssleay32.lib OUT2LIB += out32dll$/libeay32.lib diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 5d245f4..88f7088 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -28,14 +28,16 @@ -perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak -perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak +%1 util\mkfiles.pl >MINFO -+%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak -+%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak - if x%OSVERSION% == x goto skipce ++if %2 == VC-WIN32 goto not64a ++perl ms\uplink.pl win64a > ms\uptable.asm ++ml64 -c -Foms\uptable.obj ms\uptable.asm ++:not64a ++%1 util\mk1mf.pl no-asm %2 >ms\nt.mak ++%1 util\mk1mf.pl dll no-asm %2 >ms\ntdll.mak +-if x%OSVERSION% == x goto skipce -perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak -perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak -+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak -+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak - :skipce +-:skipce -perl util\mkdef.pl 32 libeay > ms\libeay32.def -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def @@ -132,3 +134,12 @@ sub do_lib_rule { +--- misc/build/openssl-0.9.8o/ms/uplink.c ++++ misc/build/openssl-0.9.8o/ms/uplink.c +@@ -1,5 +1,6 @@ + #if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE) + #define UNICODE ++#define _CRT_NON_CONFORMING_SWPRINTFS + #endif + #if defined(UNICODE) && !defined(_UNICODE) + #define _UNICODE diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch index abd1006..449ebce 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/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}/$(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 @@ -399,27 +399,21 @@ 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/prj/build.lst b/redland/prj/build.lst index f6d0562..c23ad52 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : stlport soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 60e8141..bbedd36 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= @@ -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' @@ -135,8 +135,6 @@ CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -#INSTALL_ACTION=$(GNUMAKE) install -#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR) .ENDIF diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 9066b01..a4c2187 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -73,7 +73,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= @@ -90,7 +90,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' @@ -131,8 +131,6 @@ CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -#INSTALL_ACTION=$(GNUMAKE) install -#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR) .ENDIF diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index d7b8002..c8a04dc 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -73,7 +73,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= @@ -90,7 +90,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' @@ -135,8 +135,6 @@ CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -#INSTALL_ACTION=$(GNUMAKE) install -#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR) .ENDIF diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 9f42ca2..094e110 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -46,7 +46,8 @@ ADDITIONAL_FILES= \ toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java PATCH_FILES=rhino1_5R5.patch \ - rhino1_5R5-find_swing.patch + rhino1_5R5-find_swing.patch \ + rhino1_5R5-updateToolTip.patch .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= diff --git a/rhino/rhino1_5R5-updateToolTip.patch b/rhino/rhino1_5R5-updateToolTip.patch new file mode 100644 index 0000000..16857d3 --- /dev/null +++ b/rhino/rhino1_5R5-updateToolTip.patch @@ -0,0 +1,23 @@ +--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java Wed Feb 23 10:25:09 2011 ++++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java Wed Feb 23 10:25:01 2011 +@@ -1045,9 +1045,18 @@ + } ); + } + ++ // Fix taken from <ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip> ++ // toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java: + private void updateToolTip() { +- // in case fileName is very long, try to set tool tip on frame +- Component c = getComponent(1); ++ // Try to set tool tip on frame. On Mac OS X 10.5, ++ // the number of components is different, so try to be safe. ++ int n = getComponentCount() - 1; ++ if (n > 1) { ++ n = 1; ++ } else if (n < 0) { ++ return; ++ } ++ Component c = getComponent(n); + // this will work at least for Metal L&F + if (c != null && c instanceof JComponent) { + ((JComponent)c).setToolTipText(getUrl()); diff --git a/translate_toolkit/makefile.mk b/translate_toolkit/makefile.mk new file mode 100644 index 0000000..334f663 --- /dev/null +++ b/translate_toolkit/makefile.mk @@ -0,0 +1,80 @@ +#************************************************************************* +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Petr Mladek <pmladek@suse.cz> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# Ted <ted@bear.com> +# Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +# +#************************************************************************* + +PRJ=. + +PRJNAME=trt +TARGET=trt + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(SYSTEM_TRANSLATE_TOOLKIT)" == "YES" +@all: + @echo "Using system translate toolkit..." +.ENDIF + +# --- Python paths -------------------------------------------------- + +# watch for the path delimiter +.IF "$(GUI)"=="WNT" +PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload +.ELSE # "$(GUI)"=="WNT" +PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload +.ENDIF # "$(GUI)"=="WNT" +.EXPORT: PYTHONPATH + +.IF "$(SYSTEM_PYTHON)" == "YES" +.IF "$(OS)"=="MACOSX" +PY_CMD=$(AUGMENT_LIBRARY_PATH) && unset MACOSX_DEPLOYMENT_TARGET && $(WRAPCMD) $(PYTHON) +.ELSE +PY_CMD=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(PYTHON) +.ENDIF +.ELSE # "$(SYSTEM_PYTHON)" == "YES" +PY_CMD=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python +.ENDIF # "$(SYSTEM_PYTHON)" == "YES" + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=translate-toolkit-1.8.1 +TARFILE_MD5=b4cae0700aa1c2aef7eb7f345365e6f1 +PATCH_FILES=translate-toolkit-1.8.1-skipsource.patch +BUILD_ACTION=$(PY_CMD) setup.py build +BUILD_DIR= + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk diff --git a/translate_toolkit/prj/build.lst b/translate_toolkit/prj/build.lst new file mode 100644 index 0000000..a29ad81 --- /dev/null +++ b/translate_toolkit/prj/build.lst @@ -0,0 +1,3 @@ +trt translate_toolkit : PYTHON:python NULL +trt translate_toolkit usr1 - all trt_mkout NULL +trt translate_toolkit nmake - all translate_toolkit NULL diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst new file mode 100644 index 0000000..5833cf4 --- /dev/null +++ b/translate_toolkit/prj/d.lst @@ -0,0 +1,32 @@ +mkdir: %_DEST%\lib%_EXT%\translate_toolkit +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\convert +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\filters +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\lang +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\misc +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\misc\typecheck +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\placeables +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\versioncontrol +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\xml_extract +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\search +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\search\indexing +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\services +mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\tools + +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\* %_DEST%\lib%_EXT%\translate_toolkit\translate\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\convert\* %_DEST%\lib%_EXT%\translate_toolkit\translate\convert\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\filters\* %_DEST%\lib%_EXT%\translate_toolkit\translate\filters\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\lang\* %_DEST%\lib%_EXT%\translate_toolkit\translate\lang\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\misc\* %_DEST%\lib%_EXT%\translate_toolkit\translate\misc\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\misc/typecheck\* %_DEST%\lib%_EXT%\translate_toolkit\translate\misc/typecheck\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage\* %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage/placeables\* %_DEST%\lib%_EXT%\translate_toolkit\translate\storage/placeables\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage/versioncontrol\* %_DEST%\lib%_EXT%\translate_toolkit\translate\storage/versioncontrol\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage/xml_extract\* %_DEST%\lib%_EXT%\translate_toolkit\translate\storage/xml_extract\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\search\* %_DEST%\lib%_EXT%\translate_toolkit\translate\search\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\search/indexing\* %_DEST%\lib%_EXT%\translate_toolkit\translate\search/indexing\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\services\* %_DEST%\lib%_EXT%\translate_toolkit\translate\services\* +..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\tools\* %_DEST%\lib%_EXT%\translate_toolkit\translate\tools\* +..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po %_DEST%\bin%_EXT%\* +..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo %_DEST%\bin%_EXT%\* diff --git a/translate_toolkit/translate-toolkit-1.8.1-skipsource.patch b/translate_toolkit/translate-toolkit-1.8.1-skipsource.patch new file mode 100644 index 0000000..c4cd7a0 --- /dev/null +++ b/translate_toolkit/translate-toolkit-1.8.1-skipsource.patch @@ -0,0 +1,99 @@ +Index: convert/po2oo.py +=================================================================== +--- misc/translate-toolkit-1.8.1/translate/convert/po2oo.py (revision 17314) ++++ misc/build/translate-toolkit-1.8.1/translate/convert/po2oo.py (working copy) +@@ -188,7 +188,7 @@ + filter = oocheckfilter(options, [checks.OpenOfficeChecker, checks.StandardUnitChecker], checks.openofficeconfig) + + +-def convertoo(inputfile, outputfile, templatefile, sourcelanguage=None, targetlanguage=None, timestamp=None, includefuzzy=False, multifilestyle="single", filteraction=None): ++def convertoo(inputfile, outputfile, templatefile, sourcelanguage=None, targetlanguage=None, timestamp=None, includefuzzy=False, multifilestyle="single", skip_source=False, filteraction=None): + inputstore = factory.getobject(inputfile) + inputstore.filename = getattr(inputfile, 'name', '') + if not targetlanguage: +@@ -205,7 +205,7 @@ + convertor = reoo(templatefile, languages=languages, timestamp=timestamp, includefuzzy=includefuzzy, long_keys=multifilestyle != "single", filteraction=filteraction) + outputstore = convertor.convertstore(inputstore) + # TODO: check if we need to manually delete missing items +- outputfile.write(str(outputstore)) ++ outputfile.write(outputstore.__str__(skip_source, targetlanguage)) + return True + + +@@ -223,6 +223,7 @@ + help="don't change the timestamps of the strings") + parser.add_option("", "--nonrecursiveoutput", dest="allowrecursiveoutput", default=True, action="store_false", help="don't treat the output oo as a recursive store") + parser.add_option("", "--nonrecursivetemplate", dest="allowrecursivetemplate", default=True, action="store_false", help="don't treat the template oo as a recursive store") ++ parser.add_option("", "--skipsource", dest="skip_source", default=False, action="store_true", help="don't output the source language, but fallback to it where needed") + parser.add_option("", "--filteraction", dest="filteraction", default="none", metavar="ACTION", + help="action on pofilter failure: none (default), warn, exclude-serious, exclude-all") + parser.add_fuzzy_option() +@@ -230,6 +231,7 @@ + parser.passthrough.append("sourcelanguage") + parser.passthrough.append("targetlanguage") + parser.passthrough.append("timestamp") ++ parser.passthrough.append("skip_source") + parser.passthrough.append("filteraction") + parser.run(argv) + +Index: convert/test_po2oo.py +=================================================================== +--- misc/translate-toolkit-1.8.1/translate/convert/test_po2oo.py (revision 17280) ++++ misc/build/translate-toolkit-1.8.1/translate/convert/test_po2oo.py (working copy) +@@ -170,6 +170,7 @@ + options = self.help_check(options, "--nonrecursiveoutput") + options = self.help_check(options, "--nonrecursivetemplate") + options = self.help_check(options, "--filteraction") ++ options = self.help_check(options, "--skipsource") + options = self.help_check(options, "--fuzzy") + options = self.help_check(options, "--nofuzzy") + options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE") +Index: storage/oo.py +=================================================================== +--- misc/translate-toolkit-1.8.1/translate/storage/oo.py (revision 17301) ++++ misc/build/translate-toolkit-1.8.1/translate/storage/oo.py (working copy) +@@ -246,9 +246,18 @@ + """convert to a string. double check that unicode is handled""" + return encode_if_needed_utf8(self.getoutput()) + +- def getoutput(self): ++ def getoutput(self, skip_source=False, fallback_lang=None): + """return the lines in tab-delimited form""" +- return "\r\n".join([str(line) for line in self.lines]) ++ if skip_source: ++ lines = self.lines[1:] ++ if not lines: ++ # Untranslated, so let's do fall-back: (bug 1883) ++ new_line = ooline(self.lines[0].getparts()) ++ new_line.languageid = fallback_lang ++ lines = [new_line] ++ else: ++ lines = self.lines ++ return "\r\n".join([str(line) for line in lines]) + + + class oofile: +@@ -295,11 +304,11 @@ + thisline = ooline(parts) + self.addline(thisline) + +- def __str__(self): ++ def __str__(self, skip_source=False, fallback_lang=None): + """convert to a string. double check that unicode is handled""" +- return encode_if_needed_utf8(self.getoutput()) ++ return encode_if_needed_utf8(self.getoutput(skip_source, fallback_lang)) + +- def getoutput(self): ++ def getoutput(self, skip_source=False, fallback_lang=None): + """converts all the lines back to tab-delimited form""" + lines = [] + for oe in self.units: +@@ -307,7 +316,7 @@ + warnings.warn("contains %d lines (should be 2 at most): languages %r" % (len(oe.lines), oe.languages)) + oekeys = [line.getkey() for line in oe.lines] + warnings.warn("contains %d lines (should be 2 at most): keys %r" % (len(oe.lines), oekeys)) +- oeline = str(oe) + "\r\n" ++ oeline = oe.getoutput(skip_source, fallback_lang) + "\r\n" + lines.append(oeline) + return "".join(lines) + diff --git a/unixODBC/inc/sqlext.h b/unixODBC/inc/sqlext.h index ca07d60..f31c479 100644 --- a/unixODBC/inc/sqlext.h +++ b/unixODBC/inc/sqlext.h @@ -2108,7 +2108,7 @@ VOID FireVSDebugEvent(PODBC_VS_ARGS); * connection pooling retry times */ -BOOL ODBCSetTryWaitValue ( DWORD dwValue ); +int ODBCSetTryWaitValue ( DWORD dwValue ); #ifdef __cplusplus DWORD ODBCGetTryWaitValue ( ); #else diff --git a/xsltml/prj/build.lst b/xsltml/prj/build.lst index fe09f17..fe09f17 100755..100644 --- a/xsltml/prj/build.lst +++ b/xsltml/prj/build.lst diff --git a/xsltml/prj/d.lst b/xsltml/prj/d.lst index fec9689..fec9689 100755..100644 --- a/xsltml/prj/d.lst +++ b/xsltml/prj/d.lst |