[Libreoffice-commits] .: libtextcat/makefile.mk libtextcat/prj ooo.lst.in scp2/source

[Caolán McNamara]

 libtextcat/makefile.mk               |   19 +++++--------------
 libtextcat/prj/d.lst                 |    6 +++---
 ooo.lst.in                           |    2 +-
 scp2/source/ooo/file_library_ooo.scp |    6 +-----
 4 files changed, 10 insertions(+), 23 deletions(-)

New commits:
commit 9011d8df49683829051f58b2dd7dee2453ab2605
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 23 16:03:40 2011 +0100

    bump libexttextcat to 3.0.1

diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 3578afd..7dc2dfd 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -42,33 +42,24 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=libexttextcat-3.0
-TARFILE_MD5=88ee686fd1ef31d89ce389c99008f7cf
-TARFILE_ROOTDIR=libexttextcat-3.0
+TARFILE_NAME=libexttextcat-3.0.1
+TARFILE_MD5=131b91de2d1df0ff5f0a8284b5417f8b
+TARFILE_ROOTDIR=libexttextcat-3.0.1
 
 .IF "$(GUI)"=="UNX"
 #relative to CONFIGURE_DIR
-CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
+CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
 CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
 .IF "$(OS)"=="AIX"
 CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
 .ENDIF
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS+= --disable-shared
-.ENDIF
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 
 BUILD_ACTION=make
 
-.IF "$(OS)"=="ANDROID"
-# The libtool in the libtextcat-2.2 tarball doesn't build
-# shared libraries on Android, for some reason.
-OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*.a
-.ELSE
-OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*$(DLLPOST)
-.ENDIF
+OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat.a
 
 .ENDIF # "$(GUI)"=="UNX"
 
diff --git a/libtextcat/prj/d.lst b/libtextcat/prj/d.lst
index 23c3ac5..70a07bd 100644
--- a/libtextcat/prj/d.lst
+++ b/libtextcat/prj/d.lst
@@ -4,8 +4,8 @@
 ..\%__SRC%\bin\l*.dll         %_DEST%\bin\*.dll
 
 mkdir: %_DEST%\inc\external\libtextcat
-..\%__SRC%\misc\build\libexttextcat-3.0\src\*.h %_DEST%\inc\external\libtextcat\*.h
+..\%__SRC%\misc\build\libexttextcat-3.0.1\src\*.h %_DEST%\inc\external\libtextcat\*.h
 
 # data for language guessing
-..\%__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
+..\%__SRC%\misc\build\libexttextcat-3.0.1\langclass\fpdb.conf %COMMON_DEST%\pck\fpdb.conf
+..\%__SRC%\misc\build\libexttextcat-3.0.1\langclass\LM\*.lm %COMMON_DEST%\pck\*.lm
diff --git a/ooo.lst.in b/ooo.lst.in
index 394b062..21732c1 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -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
-88ee686fd1ef31d89ce389c99008f7cf-libexttextcat-3.0.tar.bz2
+131b91de2d1df0ff5f0a8284b5417f8b-libexttextcat-3.0.1.tar.bz2
 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index fccf347..44a85f8 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1504,16 +1504,12 @@ File gid_File_Lib_Migrationoo3
   #endif
 End
 
-#ifndef SYSTEM_LIBEXTTEXTCAT
+#if defined(WNT) && !defined(SYSTEM_LIBEXTTEXTCAT)
 File gid_File_Lib_Libtextcat
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libtextcat,UNXSUFFIX));
-  #else
     Name = "libtextcat.dll";
-  #endif
 End
 #endif