Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 May 2014 23:52:43 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r353137 - in head/editors/libreoffice: . files
Message-ID:  <201405062352.s46NqhKg009123@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Tue May  6 23:52:43 2014
New Revision: 353137
URL: http://svnweb.freebsd.org/changeset/ports/353137
QAT: https://qat.redports.org/buildarchive/r353137/

Log:
  Fix a bug introduced by the upstream long ago.
  
  ​http://cgit.freedesktop.org/libreoffice/core/commit/bridges/source/?id=55189
  
  __FreeBSD_version was not defined and the preprocessor set it to 0 because
  sys/param.h was not properly included. As a consequence, it always used
  dlsym(3) hacks for the old rtld(1).

Added:
  head/editors/libreoffice/files/patch-bridges__source__cpp_uno__gcc3_linux_intel__except.cxx   (contents, props changed)
  head/editors/libreoffice/files/patch-bridges__source__cpp_uno__gcc3_linux_x86-64__except.cxx   (contents, props changed)
Modified:
  head/editors/libreoffice/Makefile

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Tue May  6 23:42:09 2014	(r353136)
+++ head/editors/libreoffice/Makefile	Tue May  6 23:52:43 2014	(r353137)
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	Full integrated office productivity suite
 

Added: head/editors/libreoffice/files/patch-bridges__source__cpp_uno__gcc3_linux_intel__except.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-bridges__source__cpp_uno__gcc3_linux_intel__except.cxx	Tue May  6 23:52:43 2014	(r353137)
@@ -0,0 +1,13 @@
+--- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx.orig	2014-04-22 18:25:28.000000000 -0400
++++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx	2014-05-06 16:19:42.000000000 -0400
+@@ -20,6 +20,10 @@
+ #include <cstdio>
+ #include <cstring>
+ #include <dlfcn.h>
++#if defined(FREEBSD)
++#include <sys/param.h>
++#endif
++
+ #include <boost/unordered_map.hpp>
+ 
+ #include <cxxabi.h>

Added: head/editors/libreoffice/files/patch-bridges__source__cpp_uno__gcc3_linux_x86-64__except.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-bridges__source__cpp_uno__gcc3_linux_x86-64__except.cxx	Tue May  6 23:52:43 2014	(r353137)
@@ -0,0 +1,12 @@
+--- bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx.orig	2014-04-22 18:25:28.000000000 -0400
++++ bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx	2014-05-06 16:19:44.000000000 -0400
+@@ -21,6 +21,9 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <dlfcn.h>
++#if defined(FREEBSD)
++#include <sys/param.h>
++#endif
+ 
+ #include <cxxabi.h>
+ #ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405062352.s46NqhKg009123>