[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits -

[Petr Mladek]

 0 files changed

New commits:
commit 7d99f8084d62dce7740b4833e1741951346b5fcd
Merge: f909227... 896c490...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 5 17:34:46 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4

commit 896c49083aec918b0710f9c62f2f775a53f28057
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 9 14:55:17 2011 +0000

    Resolves: rhbz#675806 crash in es thesaurus
    (cherry picked from commit b788f9fc846c0f47d02df02ac6733c0ac21a13c6)

diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index b1667c3..131b1ee 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -41,8 +41,10 @@ TARFILE_MD5=067201ea8b126597670b5eff72e1f66c
 
 ADDITIONAL_FILES += makefile.mk
 
-PATCH_FILES=mythes-1.2.0-vanilla-th-gen-idx.patch \
-    mythes-1.2.0-makefile-mk.diff
+PATCH_FILES=\
+    mythes-1.2.0-vanilla-th-gen-idx.patch \
+    mythes-1.2.0-makefile-mk.diff \
+    mythes-1.2.1-rhbz675806.patch
 
 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=$(BUILD_DIR)
diff --git a/mythes/mythes-1.2.1-rhbz675806.patch b/mythes/mythes-1.2.1-rhbz675806.patch
new file mode 100644
index 0000000..be50bee
--- /dev/null
+++ b/mythes/mythes-1.2.1-rhbz675806.patch
@@ -0,0 +1,10 @@
+--- misc/mythes-1.2.0/mythes.cxx	2011-02-08 10:42:57.262964286 +0000
++++ misc/build/mythes-1.2.0/mythes.cxx	2011-02-08 10:43:06.305076490 +0000
+@@ -14,6 +14,7 @@
+     encoding = NULL;
+     list = NULL;
+     offst = NULL;
++    pdfile = NULL;
+ 
+     if (thInitialize(idxpath, datpath) != 1) {
+         fprintf(stderr,"Error - can't open %s or %s\n",idxpath, datpath);
commit 5e504305de063abcdf62f8276cb8b072a06f97bc
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 8 15:31:12 2011 +0100

    Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)