incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1202010 - in /incubator/ooo/trunk/main/libxslt: libxslt-bsd.patch makefile.mk
Date Tue, 15 Nov 2011 02:35:13 GMT
Author: pfg
Date: Tue Nov 15 02:35:13 2011
New Revision: 1202010

URL: http://svn.apache.org/viewvc?rev=1202010&view=rev
Log:
FreeBSD port patches for libxslt.

Added:
    incubator/ooo/trunk/main/libxslt/libxslt-bsd.patch
Modified:
    incubator/ooo/trunk/main/libxslt/makefile.mk

Added: incubator/ooo/trunk/main/libxslt/libxslt-bsd.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libxslt/libxslt-bsd.patch?rev=1202010&view=auto
==============================================================================
--- incubator/ooo/trunk/main/libxslt/libxslt-bsd.patch (added)
+++ incubator/ooo/trunk/main/libxslt/libxslt-bsd.patch Tue Nov 15 02:35:13 2011
@@ -0,0 +1,26 @@
+--- misc/libxslt-1.1.26/libexslt/date.c.orig	2007-09-07 10:59:04.000000000 -0500
++++ misc/build/libxslt-1.1.26/libexslt/date.c	2007-09-07 10:59:21.000000000 -0500
+@@ -28,7 +28,7 @@
+ #include "config.h"
+ #endif
+ 
+-#if HAVE_LOCALTIME_R	/* _POSIX_SOURCE required by gnu libc */
++#if defined(HAVE_LOCALTIME_R) && defined(__GLIBC__)	/* _POSIX_SOURCE required by
gnu libc */
+ #ifndef _AIX51		/* but on AIX we're not using gnu libc */
+ #define _POSIX_SOURCE
+ #endif
+--- misc/libxslt-1.1.26/libxslt/extra.c.orig	2009-05-12 01:29:34.000000000 -0500
++++ misc/build/libxslt-1.1.26/libxslt/extra.c	2011-11-14 20:46:39.000000000 -0500
+@@ -243,8 +243,11 @@
+      * Calling localtime() has the side-effect of setting timezone.
+      * After we know the timezone, we can adjust for it
+      */
++#if defined(__GLIBC__)
+     lmt = gmt - timezone;
+-
++#else	/* FreeBSD DOESN'T HAVE such side-ffect */
++    lmt = gmt - local_tm->tm_gmtoff;
++#endif
+     /*
+      * FIXME: it's been too long since I did manual memory management.
+      * (I swore never to do it again.) Does this introduce a memory leak?

Modified: incubator/ooo/trunk/main/libxslt/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libxslt/makefile.mk?rev=1202010&r1=1202009&r2=1202010&view=diff
==============================================================================
--- incubator/ooo/trunk/main/libxslt/makefile.mk (original)
+++ incubator/ooo/trunk/main/libxslt/makefile.mk Tue Nov 15 02:35:13 2011
@@ -53,6 +53,7 @@ TARFILE_MD5=e61d0364a30146aaa3001296f853
 
 # libxslt-internal-symbols: #i112480#: Solaris ld requires symbols to be defined
 PATCH_FILES=libxslt-configure.patch \
+	    libxslt-bsd.patch \
             libxslt-win_manifest.patch \
             libxslt-mingw.patch \
             libxslt-internal-symbols.patch



Mime
View raw message