Skip to content

C
core
Kaydet (Commit) db84cf17 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

bump to libexttextcat 

As an aside we can always use the configuration and data files belonging to the
system version now in --with-system-libexttextcat mode, so need for the --data
option.
üst 1d1d8867
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 161 deletions
configure.in
Dosyayı görüntüle @ db84cf17
......@@ -681,7 +681,7 @@ AC_ARG_WITH(external-thes-dir,
AC_ARG_WITH(system-libs,
AS_HELP_STRING([--with-system-libs],
[Use libraries already on system -- enables all --with-system-* flags except
mozilla, libvisio, libtextcat and translate-toolkit.]),
mozilla, libvisio, libexttextcat and translate-toolkit.]),
,)
AC_ARG_WITH(system-headers,
......@@ -968,13 +968,9 @@ AC_ARG_WITH(system-lpsolve,
AS_HELP_STRING([--with-system-lpsolve],
[Use lpsolve already on system.]))
AC_ARG_WITH(system-libtextcat,
AS_HELP_STRING([--with-system-libtextcat],
[Use libtextcat already on system.]))
AC_ARG_WITH(external-libtextcat-data,
AS_HELP_STRING([--with-external-libtextcat-data],
[Use libtextcat data already on system.]))
AC_ARG_WITH(system-libexttextcat,
AS_HELP_STRING([--with-system-libexttextcat],
[Use libexttextcat already on system.]))
AC_ARG_WITH(system-cppunit,
AS_HELP_STRING([--with-system-cppunit],
......@@ -6375,36 +6371,23 @@ fi
AC_SUBST(SYSTEM_LPSOLVE)
dnl ===================================================================
dnl Checking for libtextcat
dnl Checking for libexttextcat
dnl ===================================================================
AC_MSG_CHECKING([which libtextcat to use])
if test -n "$with_system_libtextcat" && test "$with_system_libtextcat" != "no"; then
AC_MSG_CHECKING([which libexttextcat to use])
if test -n "$with_system_libexttextcat" && test "$with_system_libexttextcat" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_LIBTEXTCAT=YES
AC_CHECK_HEADER(libtextcat/textcat.h, [],
[ AC_MSG_ERROR(libtextcat headers not found.)], [])
AC_CHECK_LIB(textcat, special_textcat_Init, ,
[ AC_MSG_ERROR(libtextcat library not found or not suitable. libtextcat typically needs to be patched)], [])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBTEXTCAT=NO
BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT"
fi
AC_SUBST(SYSTEM_LIBTEXTCAT)
AC_MSG_CHECKING([which libtextcat data directory to use])
if test -n "$with_external_libtextcat_data" && test "$with_external_libtextcat_data" != "no"; then
if test "$with_external_libtextcat_data" = "yes"; then
SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat
else
SYSTEM_LIBTEXTCAT_DATA=file://$with_external_libtextcat_data
fi
AC_MSG_RESULT([$SYSTEM_LIBTEXTCAT_DATA])
SYSTEM_LIBEXTTEXTCAT=YES
PKG_CHECK_MODULES([LIBEXTTEXTCAT], [libexttextcat])
SYSTEM_LIBEXTTEXTCAT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libexttextcat`
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE LIBTEXTCATDATA"
SYSTEM_LIBEXTTEXTCAT=NO
BUILD_TYPE="$BUILD_TYPE LIBEXTTEXTCAT"
fi
AC_SUBST(SYSTEM_LIBTEXTCAT_DATA)
AC_SUBST(SYSTEM_LIBEXTTEXTCAT)
AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
AC_SUBST(LIBEXTTEXTCAT_CFLAGS)
AC_SUBST(LIBEXTTEXTCAT_LIBS)
dnl ***************************************
dnl testing libc version for Linux...
......
distro-configs/LibreOfficeDragonFly.conf
Dosyayı görüntüle @ db84cf17
......@@ -10,7 +10,7 @@
--with-fonts
--with-system-headers
--with-system-libs
--with-system-libtextcat
--with-system-libexttextcat
--with-system-python
--with-vendor=DragonFly BSD
--without-java
......
libtextcat/libtextcat-2.2.patch deleted 100644 → 0
Dosyayı görüntüle @ 1d1d8867
This source diff could not be displayed because it is too large. You can view the blob instead.
libtextcat/libtextcat-aix.patch deleted 100644 → 0
Dosyayı görüntüle @ 1d1d8867
--- misc/libtextcat-2.2/config.guess 2010-09-10 03:09:48.000000000 -0500
+++ misc/build/libtextcat-2.2/config.guess 2010-09-10 03:20:55.000000000 -0500
@@ -548,7 +548,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -560,6 +560,9 @@
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
+ if [ "$IBM_REV" == "V7BETA" ]; then
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
exit ;;
*:AIX:*:*)
--- misc/libtextcat-2.2/configure 2010-09-10 03:45:41.000000000 -0500
+++ misc/build/libtextcat-2.2/configure 2010-09-10 03:48:35.000000000 -0500
@@ -3371,7 +3371,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4944,7 +4944,7 @@
else
# PORTME Check for PIC flags for the system compiler.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix*)
lt_cv_prog_cc_wl='-Wl,'
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
@@ -5448,7 +5448,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX, the GNU linker is very broken
# Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
ld_shlibs=no
@@ -5650,7 +5650,7 @@
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -5663,7 +5663,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -6157,7 +6157,7 @@
soname_spec='${libname}${release}.so$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6563,7 +6563,7 @@
fi
;;
-aix4*)
+aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
libtextcat/makefile.mk
Dosyayı görüntüle @ db84cf17
......@@ -30,7 +30,7 @@ PRJ=.
PRJNAME=libtextcat
TARGET=libtextcat
.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "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."
......@@ -42,20 +42,9 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=libtextcat-2.2
TARFILE_MD5=128cfc86ed5953e57fe0f5ae98b62c2e
TARFILE_ROOTDIR=libtextcat-2.2
PATCH_FILES=\
libtextcat-2.2.patch \
libtextcat-aix.patch
ADDITIONAL_FILES= \
src$/utf8misc.h \
src$/utf8misc.c \
src$/win32_config.h \
src$/makefile.mk \
src$/libtextcat.map
TARFILE_NAME=libexttextcat-3.0
TARFILE_MD5=88ee686fd1ef31d89ce389c99008f7cf
TARFILE_ROOTDIR=libexttextcat-3.0
.IF "$(GUI)"=="UNX"
#relative to CONFIGURE_DIR
......
libtextcat/prj/d.lst
Dosyayı görüntüle @ db84cf17
......@@ -3,10 +3,9 @@
..\%__SRC%\lib\ilib*.* %_DEST%\lib\ilib*.*
..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
mkdir: %_DEST%\inc\libtextcat
..\%__SRC%\misc\build\libtextcat-2.2\src\*.h %_DEST%\inc\libtextcat\*.h
mkdir: %_DEST%\inc\external\libtextcat
..\%__SRC%\misc\build\libexttextcat-3.0\src\*.h %_DEST%\inc\external\libtextcat\*.h
# data for language guessing
..\data\new_fingerprints\fpdb.conf %COMMON_DEST%\pck\fpdb.conf
..\data\new_fingerprints\lm\*.lm %COMMON_DEST%\pck\*.lm
..\%__SRC%\misc\build\libexttextcat-3.0\langclass\fpdb.conf %COMMON_DEST%\pck\fpdb.conf
..\%__SRC%\misc\build\libexttextcat-3.0\langclass\LM\*.lm %COMMON_DEST%\pck\*.lm
lingucomponent/prj/build.lst
Dosyayı görüntüle @ db84cf17
lc lingucomponent : linguistic LIBTEXTCAT:libtextcat LIBTEXTCATDATA:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes LIBXSLT:libxslt NULL
lc lingucomponent : linguistic LIBEXTTEXTCAT:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes LIBXSLT:libxslt NULL
lc lingucomponent usr1 - all lc_mkout NULL
lc lingucomponent\inc nmake - all lc_inc NULL
lc lingucomponent\source\lingutil nmake - all lc_util lc_inc NULL
......
officecfg/Configuration_officecfg.mk
Dosyayı görüntüle @ db84cf17
......@@ -190,8 +190,8 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Paths-macosx.xcu \
org/openoffice/Office/Paths-unxwnt.xcu \
org/openoffice/Office/Paths-unixdesktop.xcu \
org/openoffice/Office/Paths-internallibtextcatdata.xcu \
org/openoffice/Office/Paths-externallibtextcatdata.xcu \
org/openoffice/Office/Paths-internallibexttextcatdata.xcu \
org/openoffice/Office/Paths-externallibexttextcatdata.xcu \
org/openoffice/Office/Writer-cjk.xcu \
org/openoffice/Office/Impress-ogltrans.xcu \
org/openoffice/Office/Embedding-calc.xcu \
......
officecfg/registry/data/org/openoffice/Office/Paths.xcu
Dosyayı görüntüle @ db84cf17
......@@ -169,8 +169,8 @@
<node oor:name="Fingerprint" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths">
<node install:module="internallibtextcatdata" oor:name="$(insturl)/share/fingerprint" oor:op="fuse"/>
<node install:module="externallibtextcatdata" oor:name="${SYSTEM_LIBTEXTCAT_DATA}" oor:op="fuse"/>
<node install:module="internallibexttextcatdata" oor:name="$(insturl)/share/fingerprint" oor:op="fuse"/>
<node install:module="externallibexttextcatdata" oor:name="${SYSTEM_LIBEXTTEXTCAT_DATA}" oor:op="fuse"/>
</node>
</node>
......
ooo.lst.in
Dosyayı görüntüle @ db84cf17
......@@ -3,7 +3,7 @@ http://dev-www.libreoffice.org/src
63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
88ee686fd1ef31d89ce389c99008f7cf-libexttextcat-3.0.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
......
postprocess/packregistry/makefile.mk
Dosyayı görüntüle @ db84cf17
......@@ -338,10 +338,10 @@ MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
.END
.END
.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcatdata.xcu
.IF "$(SYSTEM_LIBEXTTEXTCAT_DATA)" != ""
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu
.ELSE
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibtextcatdata.xcu
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibexttextcatdata.xcu
.END
MY_DEPS_math = main
......
scp2/source/ooo/file_library_ooo.scp
Dosyayı görüntüle @ db84cf17
......@@ -1504,7 +1504,7 @@ File gid_File_Lib_Migrationoo3
#endif
End
#ifndef SYSTEM_LIBTEXTCAT
#ifndef SYSTEM_LIBEXTTEXTCAT
File gid_File_Lib_Libtextcat
TXT_FILE_BODY;
Styles = (PACKED);
......
scp2/source/ooo/file_ooo.scp
Dosyayı görüntüle @ db84cf17
......@@ -472,7 +472,7 @@ STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
#endif
#endif
#ifndef SYSTEM_LIBTEXTCAT_DATA
#ifndef SYSTEM_LIBEXTTEXTCAT
// fingerprint files (lm)
File gid_File_Conf_Fpdb
......
scp2/source/ooo/makefile.mk
Dosyayı görüntüle @ db84cf17
......@@ -228,12 +228,8 @@ SCPDEFS+=-DSYSTEM_PYTHON
.ENDIF
.ENDIF
.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
SCPDEFS+=-DSYSTEM_LIBTEXTCAT
.ENDIF
.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA
.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
SCPDEFS+=-DSYSTEM_LIBEXTTEXTCAT
.ENDIF
.IF "$(WITH_VC_REDIST)" == "TRUE"
......
set_soenv.in
Dosyayı görüntüle @ db84cf17
......@@ -1994,8 +1994,10 @@ ToFile( "HYPHEN_LIB", "@HYPHEN_LIB@", "e" );
ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
ToFile( "MYTHES_CFLAGS", "@MYTHES_CFLAGS@", "e" );
ToFile( "MYTHES_LIBS", "@MYTHES_LIBS@", "e" );
ToFile( "SYSTEM_LIBTEXTCAT", "@SYSTEM_LIBTEXTCAT@","e" );
ToFile( "SYSTEM_LIBTEXTCAT_DATA","@SYSTEM_LIBTEXTCAT_DATA@","e" );
ToFile( "SYSTEM_LIBEXTTEXTCAT", "@SYSTEM_LIBEXTTEXTCAT@", "e" );
ToFile( "SYSTEM_LIBEXTTEXTCAT_DATA","@SYSTEM_LIBEXTTEXTCAT_DATA@","e" );
ToFile( "LIBEXTTEXTCAT_CFLAGS", "@LIBEXTTEXTCAT_CFLAGS@", "e" );
ToFile( "LIBEXTTEXTCAT_LIBS", "@LIBEXTTEXTCAT_LIBS@", "e" );
ToFile( "XAU_LIBS", "@XAU_LIBS@", "e" );
ToFile( "GXX_INCLUDE_PATH", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
......
solenv/bin/modules/installer/ziplist.pm
Dosyayı görüntüle @ db84cf17
......@@ -798,7 +798,7 @@ sub add_variables_to_allvariableshashref
$variableshashref->{'PRODUCTMINOR'} = $localminor;
$variableshashref->{'PRODUCTBUILDID'} = $installer::globals::buildid;
$variableshashref->{'SYSTEM_LIBTEXTCAT_DATA'} = $ENV{'SYSTEM_LIBTEXTCAT_DATA'} , if( defined $ENV{'SYSTEM_LIBTEXTCAT_DATA'} && $ENV{'SYSTEM_LIBTEXTCAT_DATA'} ne "" );
$variableshashref->{'SYSTEM_LIBEXTTEXTCAT_DATA'} = $ENV{'SYSTEM_LIBEXTTEXTCAT_DATA'} , if( defined $ENV{'SYSTEM_LIBEXTTEXTCAT_DATA'} && $ENV{'SYSTEM_LIBEXTTEXTCAT_DATA'} ne "" );
}
1;
splitbuild/extern.lst
Dosyayı görüntüle @ db84cf17
afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib
afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libexttextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment