liblangtag/liblangtag-0.4.0-mac.patch | 7 +++++--
liblangtag/liblangtag-0.4.0-windows.patch | 8 +++++++-
liblangtag/makefile.mk | 3 +++
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 52e51f0fe7e3badee58cc8c63f73bf63f9cc79ec
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed Nov 7 16:43:26 2012 +0200
Should not call lt_mem_add_ref() with a NULL pointer here either
Change-Id: I34f7ccca0fdfa71a53c2a80ae51178c5461b5640
diff --git a/liblangtag/liblangtag-0.4.0-mac.patch
b/liblangtag/liblangtag-0.4.0-mac.patch
index 6f9c93d..dc44758 100644
--- a/liblangtag/liblangtag-0.4.0-mac.patch
+++ b/liblangtag/liblangtag-0.4.0-mac.patch
@@ -45,7 +45,7 @@ diff -r -u liblangtag-0.4.0.org/liblangtag/lt-error.c
liblangtag-0.4.0/liblangta
lt_bool_t allocated;
lt_return_val_if_fail (error != NULL, NULL);
-@@ -117,10 +114,7 @@
+@@ -117,13 +114,9 @@
d->message = lt_strdup_vprintf(message, ap);
va_end(ap);
@@ -56,7 +56,10 @@ diff -r -u liblangtag-0.4.0.org/liblangtag/lt-error.c
liblangtag-0.4.0/liblangta
+ d->stack_size = 0;
lt_mem_add_ref(&d->parent, d->message, free);
- lt_mem_add_ref(&d->parent, d->traces, free);
+- lt_mem_add_ref(&d->parent, d->traces, free);
+
+ allocated = (*error)->data == NULL;
+ (*error)->data = lt_list_append((*error)->data, d,
(lt_destroy_func_t)lt_mem_unref);
diff -r -u liblangtag-0.4.0.org/liblangtag/lt-ext-module.c
liblangtag-0.4.0/liblangtag/lt-ext-module.c
--- misc/liblangtag-0.4.0.org/liblangtag/lt-ext-module.c 2012-11-06
09:15:59.000000000 -0600
+++ misc/build/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2012-11-06
09:30:31.000000000 -0600
commit 2e7675b21707fc4efd012bda336a88307ecfc6ec
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed Nov 7 16:14:45 2012 +0200
Must not call lt_mem_add_ref() with a NULL pointer
Otherwise will get the
lt-mem.c: line 216: assertion `p != ((void *)0)' failed
message.
Change-Id: Ic585ad638211fda66a54725c5a4bd041499349ef
diff --git a/liblangtag/liblangtag-0.4.0-windows.patch
b/liblangtag/liblangtag-0.4.0-windows.patch
index f922cab..fef4a48 100644
--- a/liblangtag/liblangtag-0.4.0-windows.patch
+++ b/liblangtag/liblangtag-0.4.0-windows.patch
@@ -176,7 +176,7 @@
#include <stdlib.h>
#include "lt-list.h"
#include "lt-mem.h"
-@@ -120,9 +120,13 @@
+@@ -120,13 +120,18 @@
d->message = lt_strdup_vprintf(message, ap);
va_end(ap);
@@ -190,6 +190,12 @@
d->stack_size = size;
lt_mem_add_ref(&d->parent, d->message, free);
+- lt_mem_add_ref(&d->parent, d->traces, free);
++ if (d->traces != NULL)
++ lt_mem_add_ref(&d->parent, d->traces, free);
+
+ allocated = (*error)->data == NULL;
+ (*error)->data = lt_list_append((*error)->data, d,
(lt_destroy_func_t)lt_mem_unref);
--- misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c
+++ misc/build/liblangtag-0.4.0/liblangtag/lt-ext-module.c
@@ -15,11 +15,15 @@
commit fd58e9d5a969efa9ef983998d4a40f301c7ff695
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed Nov 7 16:11:01 2012 +0200
Use -Zi when debug info wanted with MSVC
It really sucks to have to propagate debugging options to the compiler
in an ad-hoc fashion like this. But then each dmake-based external
library module really is an individual, especially the ways they are
built with MSVC.
Liblangtag is especially exotic, as it uses autotools and libtool(!)
also for a MSVC build. Which works, but just barely, almost by
accident. For instance, it ends up using the Cygwin ar and ranlib on
MSVC-produced object files. Which luckily seems to work at least with
MSVC2008.
Change-Id: I1c5244b2a599775c04ae8a003e4a096a0a11648f
diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index c9b72a2..bd813fa 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -74,6 +74,9 @@ CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)/external'
.IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)/libxml2.lib'
CC:=$(CC) -MD
+.IF "$(debug)"=="TRUE"
+CC:=$(CC) -Zi
+.ENDIF
.ELSE
CONFIGURE_FLAGS+= LIBXML2_LIBS='-L$(SOLARLIBDIR) -lxml2'
.ENDIF
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
