summaryrefslogtreecommitdiff
path: root/libtextcat
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-29 12:02:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-29 12:48:40 +0100
commit61b5ee916edcf655a3127ab4aa9ce25a232d913e (patch)
treec8fd25903c05ad497d0b1ca68573d323bb0fb257 /libtextcat
parent8de6948e4f67b65d0320f7ec08ab9ad8328b2411 (diff)
bump to libexttextcat 3.1.0, enable previously broken languages
Diffstat (limited to 'libtextcat')
-rw-r--r--libtextcat/libexttextcat-3.0.1.patch4
-rw-r--r--libtextcat/makefile.mk19
-rw-r--r--libtextcat/prj/d.lst5
3 files changed, 19 insertions, 9 deletions
diff --git a/libtextcat/libexttextcat-3.0.1.patch b/libtextcat/libexttextcat-3.0.1.patch
index 3128560dbd24..2d55979f2247 100644
--- a/libtextcat/libexttextcat-3.0.1.patch
+++ b/libtextcat/libexttextcat-3.0.1.patch
@@ -1,5 +1,5 @@
---- misc/libexttextcat-3.0.1/config.sub 2011-09-20 17:14:22.000000000 +0200
-+++ misc/build/libexttextcat-3.0.1/config.sub 2011-09-26 16:05:16.000000000 +0200
+--- 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
@@ -320,7 +320,7 @@
basic_machine=$basic_machine-pc
;;
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index d7f7f1bc08b4..c7e4d1b4a350 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -42,9 +42,11 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=libexttextcat-3.0.1
-TARFILE_MD5=131b91de2d1df0ff5f0a8284b5417f8b
-TARFILE_ROOTDIR=libexttextcat-3.0.1
+# 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
@@ -71,9 +73,18 @@ OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat.a
BUILD_ACTION=cd src && dmake $(MAKEMACROS)
.ENDIF # "$(GUI)"=="WNT"
+ALLTAR: $(BIN)/fingerprint.zip
+
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+.INCLUDE : target.mk
+$(BIN)/fingerprint.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
+ @-rm -f $@
+ @echo creating ../../../../../$@
+ $(COMMAND_ECHO)zip -j $(ZIP_VERBOSITY) $@ $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/fpdb.conf
+ $(COMMAND_ECHO)find $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/LM \
+ -name "*.lm" -print0 | \
+ xargs -0 zip -j $(ZIP_VERBOSITY) $@
diff --git a/libtextcat/prj/d.lst b/libtextcat/prj/d.lst
index 70a07bd193f1..e52e342b8770 100644
--- a/libtextcat/prj/d.lst
+++ b/libtextcat/prj/d.lst
@@ -4,8 +4,7 @@
..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
mkdir: %_DEST%\inc\external\libtextcat
-..\%__SRC%\misc\build\libexttextcat-3.0.1\src\*.h %_DEST%\inc\external\libtextcat\*.h
+..\%__SRC%\misc\build\libexttextcat-3.1.0\src\*.h %_DEST%\inc\external\libtextcat\*.h
# data for language guessing
-..\%__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
+..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck\*.zip