[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeMinGW.conf liblangtag/liblangtag-0.4.0-mingw.patch

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 7 05:32:31 PST 2012


 distro-configs/LibreOfficeMinGW.conf    |    1 -
 liblangtag/liblangtag-0.4.0-mingw.patch |   11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 7551d099d853fe5fbafc4d6a3bf4d71ac0e66dd1
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Nov 7 14:30:57 2012 +0100

    There is no --with-system-glib any more.
    
    Change-Id: I43690a0196e54d45567f30151d95cf10f0ac3c38

diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf
index 9bfafc1..642dcc9 100644
--- a/distro-configs/LibreOfficeMinGW.conf
+++ b/distro-configs/LibreOfficeMinGW.conf
@@ -8,7 +8,6 @@
 --with-system-db
 --with-system-expat
 --with-system-gettext
---with-system-glib
 --with-system-graphite
 --with-system-hunspell
 --with-system-icu
commit ac449bffdc4ed8ac8aaa9eddd98e975cc61b5635
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Nov 7 14:29:50 2012 +0100

    Fix MinGW build.
    
    Change-Id: I12fb6b8b8fdb7b9b00070c6d2a87da5d7d2fed13

diff --git a/liblangtag/liblangtag-0.4.0-mingw.patch b/liblangtag/liblangtag-0.4.0-mingw.patch
index b3ea943..82592aa 100644
--- a/liblangtag/liblangtag-0.4.0-mingw.patch
+++ b/liblangtag/liblangtag-0.4.0-mingw.patch
@@ -62,3 +62,14 @@
  
  ACLOCAL_AMFLAGS =			\
  	-I m4macros			\
+--- misc/liblangtag-0.4.0/extensions/lt-ext-ldml-u.c	2012-11-07 14:26:53.000000000 +0100
++++ misc/build/liblangtag-0.4.0/extensions/lt-ext-ldml-u.c	2012-11-07 14:27:39.000000000 +0100
+@@ -14,7 +14,7 @@
+ #include "config.h"
+ #endif
+ 
+-#ifndef _WIN32
++#if !defined( _WIN32 ) || defined( __MINGW32__ )
+ #include <stdint.h>
+ #else
+ typedef unsigned __int64 uint64_t;


More information about the Libreoffice-commits mailing list