diff options
| -rw-r--r-- | libexttextcat/makefile.mk (renamed from libtextcat/makefile.mk) | 17 | ||||
| -rw-r--r-- | libexttextcat/prj/build.lst (renamed from libtextcat/prj/build.lst) | 0 | ||||
| -rw-r--r-- | libexttextcat/prj/d.lst (renamed from libtextcat/prj/d.lst) | 0 | ||||
| -rw-r--r-- | libtextcat/libexttextcat-3.0.1.patch | 20 | ||||
| -rw-r--r-- | lingucomponent/prj/build.lst | 2 |
5 files changed, 8 insertions, 31 deletions
diff --git a/libtextcat/makefile.mk b/libexttextcat/makefile.mk index c7e4d1b4a350..ce607a30a927 100644 --- a/libtextcat/makefile.mk +++ b/libexttextcat/makefile.mk @@ -27,12 +27,12 @@ PRJ=. -PRJNAME=libtextcat -TARGET=libtextcat +PRJNAME=libexttextcat +TARGET=libexttextcat .IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES" all: - @echo "An already available installation of libtextcat should exist on your system." + @echo "An already available installation of libexttextcat should exist on your system." @echo "Therefore the version provided here does not need to be built in addition." .ENDIF @@ -44,12 +44,9 @@ all: # See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream # sources, far better to commit your changes in there -TARFILE_NAME=libexttextcat-3.1.0 -TARFILE_MD5=8dc93ffd48cb80b738075ce37df8f915 -TARFILE_ROOTDIR=libexttextcat-3.1.0 - -PATCH_FILES=\ - libexttextcat-3.0.1.patch +TARFILE_NAME=libexttextcat-3.1.1 +TARFILE_MD5=33f01c57f92eb6f940b59015c35a4eea +TARFILE_ROOTDIR=libexttextcat-3.1.1 .IF "$(GUI)"=="UNX" #relative to CONFIGURE_DIR @@ -64,7 +61,7 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) BUILD_ACTION=make -OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat.a +OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libexttextcat.a .ENDIF # "$(GUI)"=="UNX" diff --git a/libtextcat/prj/build.lst b/libexttextcat/prj/build.lst index 85163759b48e..85163759b48e 100644 --- a/libtextcat/prj/build.lst +++ b/libexttextcat/prj/build.lst diff --git a/libtextcat/prj/d.lst b/libexttextcat/prj/d.lst index e52e342b8770..e52e342b8770 100644 --- a/libtextcat/prj/d.lst +++ b/libexttextcat/prj/d.lst diff --git a/libtextcat/libexttextcat-3.0.1.patch b/libtextcat/libexttextcat-3.0.1.patch deleted file mode 100644 index bed905c47ea9..000000000000 --- a/libtextcat/libexttextcat-3.0.1.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/libexttextcat-3.1.0/config.sub 2011-09-20 17:14:22.000000000 +0200 -+++ misc/build/libexttextcat-3.1.0/config.sub 2011-09-26 16:05:16.000000000 +0200 -@@ -123,7 +123,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) -@@ -1294,7 +1294,7 @@ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst index 23be2d4334d3..07c9718a440d 100644 --- a/lingucomponent/prj/build.lst +++ b/lingucomponent/prj/build.lst @@ -1,4 +1,4 @@ -lc lingucomponent : linguistic LIBEXTTEXTCAT:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes LIBXSLT:libxslt NULL +lc lingucomponent : linguistic LIBEXTTEXTCAT:libexttextcat 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 |