20:15 Tijl Coosemans (tijl) 

editors/openoffice-4: make robust against __cxa_exception ABI changes

Patch openoffice to replace __cxa_get_globals()->caughtExceptions,
which is a pointer to the start of a struct __cxa_exception, with
__cxa_current_primary_exception(), which is a pointer to the end.  This
allows struct __cxa_exception to be extended at the start as was
recently done in FreeBSD main and stable/13 on 64-bit architectures.

Recently on FreeBSD main and stable/13 __attribute__((__aligned__)) was
added to struct _Unwind_Exception which changes its size on 32-bit
architectures, and that of __cxa_exception as well.  Patch openoffice
to detect this so packages built on 13.0 still work on 13.1.

Add a build dependency on a recent version of devel/libunwind so we
always build with an unwind.h that has the right definition of
_Unwind_Exception.

    88045c0

09:23 truckman 

Upgrade editors/openoffice-4 to version 4.1.8.

Fix bugs in LICENSE_FILE extraction.

Don't pass LD_FLAGS to the inner make.  It can cause problems.

Many of our local patches have been upstreamed.

 

03:42 truckman 

On amd64, clang++ 4.0 uses the MOVAPS SSE instruction to initialize
sufficiently large objects returned by the "new" operator.  This
requires that the object have 16-byte alignment.  The FreeBSD
malloc() implementation does the correct thing here, but OpenOffice
has a couple of internal memory allocator implementations that only
align to 8-byte boundaries at most.  In addition OpenOffice overrides
the new operator to interpose a couple of layers of wrappers.  If
the --enable-debug option is passed to configure, the wrapper adds
8 to the size passed to the allocator and adds an 8 byte offset to
the pointer returned by the allocator to make room for a signature
that it adds to the beginning of the memory block (the signature
is validated and the inverse transformation is done when the memory
is freed).  This breaks the proper alignment done by the mamory
allocator.  Fix these problems by adding an EXTRA_PATCH that teaches
the internal OpenOffice memory allocators to do 16-byte alignment
and to use a 16-byte offset in the "new" wrapper, and apply this
patch on amd64 if clang 4.0 is the system compiler.
Pass the --with-alloc=system flag to configure so that the libc
version of malloc() is used instead of one of the internal memory
allocator implementations.

Fix a few mis-sorts in BUILD_DEPENDS and don't list www/p5-libwww
twice.

Fix a compile error in the bridges code when --enable-debug is
specified.

Fix a sporadic failure in the clear_001 QA test that occasionally
breaks the build.  The nominal mutex hold time is 5 seconds, but
because it is only checked one per second, the actual time is more
likely to be around 6 seconds.  When the before time value is
subtracted from the after time value, the result might be 7 whole
seconds and a large negative number of nanoseconds.  Since the
pass/fail check only looks at the difference in the seconds fields,
it will fail the "< 7" assertion.  Relax the assertion to "<= 7"
as a quick fix.

The editors/openoffice-4 port does not need poppler.  It is only
needed for the PDF import extension, which is not built in OpenOffice
4.1.x.

Cherrypick some cleanups from PR 216245 [1]:
 * The --without-stlport configure flag is not needed.

 * Pass the -with-build-version flag to configure (but use ${PKGNAME}
   for completeness instead of just  ${PORTNAME}-${PORTVERSION})

 * Tweak a comment in the Makefile.

PR:		216245
Submitted by:	pfg [1]

 

16:29 truckman 

Upgrade to Apache OpenOffice 4.1.2

  * Release Notes:
   <https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2+Release+Notes
>

  * Bug Fixes: <http://s.apache.org/9uI>

  * Improvements / Enhancements

    o Several distinct enhancements were applied to the WebDAV
      management and file locking: OpenOffice is now able to properly
      interact with Microsoft Sharepoint, enabling a more productive
      usage in corporate-level environments. These enhancements were
      funded, and contributed upstream, by the Emilia-Romagna regional
      administration (Italy), where OpenOffice was adopted a few years
      ago.

    o The PDF export dialog was redesigned for better usability on small
      laptop screens.

    o Underlying libraries for the solver and digital signing
      functionality have been updated, for better performance and
      increased security.

    o OpenOffice 4.1.2 fixes security vulnerabilities. See:
      <http://www.openoffice.org/security/bulletin.html>.
      Note: CVE-2015-1774 was previously fixed in the FreeBSD port.

  * Removed/Retired Features

    o Support for the ancient .hwp file format was retired.  This was
      a rarely used format created with versions of the program named
      "Hangul Word Processor" prior to 1997; therefore impact on users
      is expected to be minimal.  The few users who have files in the
      .hwp format should convert them to ODF using Apache OpenOffice
      4.1.1 before upgrading.

Nuke the patches or the parts of patches that have been committed
upstream.

Add an option to build and install the SDK and disable it by default.
The port has been building it all along, but not installing it.  We
save only a small amount of time by not building it, but installing it
would require about 70 MB of extra space space.  The FreeBSD port has
been patched to allow building the SDK with OpenJDK8.

Add an option to build and install the Wiki Publisher extension.  If
it is enabled, it is now handled as an integrated extension, so the
user does not have manually use the extension manager to track it down
and install it.

Tweak an existing script to install the icons instead of using a bunch
of complicated code in the Makefile.  Add USES=shared-mime-info.

Nuke some unused targets in Makefiles.others.  The SDK is now explicitly
handled as an option, and the Uno Runtime Environment hasn't had the
capability for separate installation in quite some time.

Nuke an extraneous "-" from the tar command when unpacking the
installation archive during staging.

 

22:13 truckman 

Various build updates from openoffice-devel (primarily r382334 and
r391960):

  * patch-i118574 no longer seems necessary for a clean build

  * Regnerate patch-i114430 with make makepatch

  * Build using boost from ports instead of the bundled boost

  * Build using silgraphite from ports instead of the bundled version

  * Add missing LIB_DEPENDS that are brought in by other dependencies,
    but are directly linked as requested by pkgconfig/*.pc

  * Build using sane and xrender headers from ports instead of bundled
    headers

  * Update LICENSE* to account for bundled software

  * Reformat pkg-message and mention that the scanner interface can be
    enabled by installing sane-backends

  * Pet portlint

Update patch-bridges*, patch-freebsd.mk, patch-jpeg, patch-nss, patch-sal,
patch-set_soenv.in, patch-unxfbsd.mk, and patch-webdav to the versions
accepted upstream, regenerated with make makepatch.

Regenerate patch-CVE-2015-1774 with make makepatch.

Approved by:	mat (mentor, implicit)

 

15:04 truckman 

Unbreak editors/openoffice-4 and editors/openoffice-devel on systems
where clang is the base compiler.  The issue was that these ports
would only successfully build with gcc and libstdc++, so they
specified USE_GCC=yes, but they linked to other C++ ports that were
compiled with clang, which brought in libc++.  The conflict between
libstdc++ and libc++ caused the application to crash whenever an
operation that popped up a dialog box was attempted.  Thanks to
dim@ for helping me track this down.  The fix is to patch various
bits of the openoffice souce to allow it to be built with clang
on systems where the C++ dependencies are also compiled with clang. [1]

Add a CUPS option so that CUPS can be disabled [2].

Register print/cups-client as a LIB_DEPENDS when CUPS is enabled.

(Only the first 15 lines of the commit message are shown above )