[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 4 commits - bin/g distro-configs/LibreOfficeOpenBSD.conf.in

[Robert Nagy]

 bin/g                                     |    2 
 distro-configs/LibreOfficeOpenBSD.conf.in |   84 ++++++++++++++++--------------
 2 files changed, 46 insertions(+), 40 deletions(-)

New commits:
commit 31c22a54fa7a79d8321a55f435dbb95d1c853162
Author: Robert Nagy <robert at openbsd.org>
Date:   Sat Nov 6 13:11:59 2010 +0100

    use system cppunit on openbsd

diff --git a/distro-configs/LibreOfficeOpenBSD.conf.in b/distro-configs/LibreOfficeOpenBSD.conf.in
index f2dd83d..a94c74c 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf.in
+++ b/distro-configs/LibreOfficeOpenBSD.conf.in
@@ -35,6 +35,7 @@
 --with-myspell-dicts
 --with-system-boost
 --with-system-cairo
+--with-system-cppunit
 --with-system-curl
 --with-system-db
 --with-system-expat
commit 0d75dad93126374797578c7f3679c45e8ed98b60
Author: Robert Nagy <robert at openbsd.org>
Date:   Fri Nov 5 11:20:09 2010 +0100

    tidy up

diff --git a/distro-configs/LibreOfficeOpenBSD.conf.in b/distro-configs/LibreOfficeOpenBSD.conf.in
index cf2556c..f2dd83d 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf.in
+++ b/distro-configs/LibreOfficeOpenBSD.conf.in
@@ -1,53 +1,61 @@
---with-vendor=\"The OpenBSD project\"
+--disable-build-mozilla
+--disable-crypt-link
 --disable-dbus
+--disable-kde
 --disable-kde4
---enable-cairo
---with-system-cairo
---enable-gstreamer
+--disable-mozilla
+--disable-nss-module
 --disable-odk
+--disable-opengl
+--disable-pam-link
+--disable-randr-link
+--disable-unix-qstart
+--disable-xrender-link
 --enable-binfilter
+--enable-broffice
+--enable-cairo
+--enable-epm
 --enable-gnome-vfs
+--enable-gstreamer
 --enable-hids
 --enable-lockdown
---disable-opengl
+--enable-minimizer
+--enable-pdfimport
+--enable-presenter-console
+--enable-report-builder
+--enable-wiki-publisher
+--with-alloc=system
+--with-ant-home=/usr/local/ant/lib
+--with-dict=ALL
+--with-extension-integration
+--with-fonts
+--with-gnu-cp=/usr/local/bin/gcp
 --with-java-target-version=1.5
 --with-jdk-home=/usr/local/jdk-1.5.0
 --with-myspell-dicts
---enable-epm
---disable-kde
---disable-mozilla
---disable-build-mozilla
---disable-nss-module
---without-system-mozilla
+--with-system-boost
+--with-system-cairo
+--with-system-curl
+--with-system-db
+--with-system-expat
+--with-system-hunspell
+--with-system-icu
+--with-system-jars
 --with-system-jpeg
+--with-system-libwpd
 --with-system-libxml
 --with-system-libxslt
+--with-system-mesa-headers
+--with-system-neon
+--with-system-openssl
+--with-system-poppler
 --with-system-python
---with-system-zlib
---with-system-jars
+--with-system-redland
 --with-system-stdlibs
---disable-crypt-link
---disable-pam-link
---disable-xrender-link
---disable-randr-link
+--with-system-xrender-headers
+--with-system-zlib
+--with-vendor=\"The OpenBSD project\"
+--without-junit
 --without-openldap
---with-system-mesa-headers
+--without-system-mozilla
 --without-unix-wrapper
---with-fonts
---enable-minimizer
---enable-presenter-console
---enable-pdfimport
---with-system-poppler
---enable-wiki-publisher
---enable-report-builder
---with-extension-integration
---with-ant-home=/usr/local/ant/lib
---with-dict=ALL
---with-lang=en_US
---with-system-openssl
---disable-unix-qstart
---enable-broffice
---with-alloc=system
---without-junit
---with-gnu-cp=/usr/local/bin/gcp
---with-system-boost
commit e8989d457f616795645d43030187fd406c55fa17
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 01:21:38 2010 +0100

    Use /usr/bin/env bash

diff --git a/bin/g b/bin/g
index f0928de..b1c80fc 100755
--- a/bin/g
+++ b/bin/g
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Wrapper for git to handle more subdirs at the same time
 #
commit a09fa107a855d4a78b1e79999e791151e1918f23
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 00:43:54 2010 +0100

    make LibreOffice boostrap on OpenBSD

diff --git a/distro-configs/LibreOfficeOpenBSD.conf.in b/distro-configs/LibreOfficeOpenBSD.conf.in
index f3e62c6..cf2556c 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf.in
+++ b/distro-configs/LibreOfficeOpenBSD.conf.in
@@ -19,7 +19,6 @@
 --disable-build-mozilla
 --disable-nss-module
 --without-system-mozilla
---with-system-freetype
 --with-system-jpeg
 --with-system-libxml
 --with-system-libxslt
@@ -32,7 +31,6 @@
 --disable-xrender-link
 --disable-randr-link
 --without-openldap
---with-system-xrender-headers
 --with-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
@@ -43,14 +41,13 @@
 --enable-wiki-publisher
 --enable-report-builder
 --with-extension-integration
---with-linker-hash-style=both
 --with-ant-home=/usr/local/ant/lib
 --with-dict=ALL
 --with-lang=en_US
 --with-system-openssl
 --disable-unix-qstart
 --enable-broffice
---disable-pasf
 --with-alloc=system
 --without-junit
 --with-gnu-cp=/usr/local/bin/gcp
+--with-system-boost