diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-30 14:03:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-30 15:43:27 +0100 |
| commit | f8c753fd3bf770777ec82428a40b5779279b33d6 (patch) | |
| tree | 921a3fd4682462edeae328eef6ed805bfba7a617 /libexttextcat | |
| parent | 8201c8a5f680947c2e855504be321afb1e5bc06a (diff) | |
bump to libexttextcat-3.3.1 and drop visibility patch
Change-Id: Id0e42068a1cd614a2e66e7f050c55b351999f2ae
Diffstat (limited to 'libexttextcat')
| -rw-r--r-- | libexttextcat/android.patch | 4 | ||||
| -rw-r--r-- | libexttextcat/libexttextcat-visibility.patch | 10 | ||||
| -rw-r--r-- | libexttextcat/makefile.mk | 8 | ||||
| -rw-r--r-- | libexttextcat/prj/d.lst | 2 |
4 files changed, 7 insertions, 17 deletions
diff --git a/libexttextcat/android.patch b/libexttextcat/android.patch index bca8fe12fbed..36abf18253fc 100644 --- a/libexttextcat/android.patch +++ b/libexttextcat/android.patch @@ -1,5 +1,5 @@ ---- misc/libexttextcat-3.3.0/config.sub -+++ misc/build/libexttextcat-3.3.0/config.sub +--- misc/libexttextcat-3.3.1/config.sub ++++ misc/build/libexttextcat-3.3.1/config.sub @@ -120,7 +120,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` diff --git a/libexttextcat/libexttextcat-visibility.patch b/libexttextcat/libexttextcat-visibility.patch deleted file mode 100644 index 86c0efb4f61f..000000000000 --- a/libexttextcat/libexttextcat-visibility.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/libexttextcat-3.3.0/src/makefile.mk 2011-10-07 00:09:38.000000000 +0200 -+++ misc/build/libexttextcat-3.3.0/src/makefile.mk 2011-11-15 13:57:19.742958488 +0100 -@@ -33,6 +33,7 @@ - - USE_DEFFILE=TRUE - EXTERNAL_WARNINGS_NOT_ERRORS := TRUE -+VISIBILITY_HIDDEN=TRUE - UWINAPILIB= - - .INCLUDE : settings.mk diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk index 5e189115401c..a0733fdfd00b 100644 --- a/libexttextcat/makefile.mk +++ b/libexttextcat/makefile.mk @@ -44,10 +44,10 @@ all: # See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream # sources, far better to commit your changes in there -TARFILE_NAME=libexttextcat-3.3.0 -TARFILE_MD5=dc8fc13710a987edd59f0bcae004fec2 -TARFILE_ROOTDIR=libexttextcat-3.3.0 -PATCH_FILES=libexttextcat-visibility.patch android.patch +TARFILE_NAME=libexttextcat-3.3.1 +TARFILE_MD5=6097739c841f671cb21332b9cc593ae7 +TARFILE_ROOTDIR=libexttextcat-3.3.1 +PATCH_FILES=android.patch .IF "$(GUI)"=="UNX" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" diff --git a/libexttextcat/prj/d.lst b/libexttextcat/prj/d.lst index 5bc6031a4611..f96c7249d226 100644 --- a/libexttextcat/prj/d.lst +++ b/libexttextcat/prj/d.lst @@ -4,7 +4,7 @@ ..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll mkdir: %_DEST%\inc\external\libexttextcat -..\%__SRC%\misc\build\libexttextcat-3.3.0\src\*.h %_DEST%\inc\external\libexttextcat\*.h +..\%__SRC%\misc\build\libexttextcat-3.3.1\src\*.h %_DEST%\inc\external\libexttextcat\*.h # data for language guessing ..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck\*.zip |