sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Arjan Bouter (eb26d7e0e990372973bf59c496fdf1b2083515c1)
- From: Arjan Bouter <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (eb26d7e0e990372973bf59c496fdf1b2083515c1)
- Date: Mon, 31 Aug 2009 18:59:06 -0500
GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:
chat-libs/ptlib/HISTORY | 3
chat-libs/ptlib/SUB_DEPENDS | 2
dev/null |binary
editors/openoffice/BUILD | 32 ++
editors/openoffice/CONFIGURE | 21 +
editors/openoffice/DEPENDS | 154
+++++++-----
editors/openoffice/DETAILS | 24 +
editors/openoffice/HISTORY | 4
editors/openoffice/OOo_3.1.0_src_binfilter.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.0_src_core.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.0_src_extensions.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.0_src_l10n.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.0_src_system.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.0_src_testautomation.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig |binary
editors/openoffice/PREPARE | 2
editors/openoffice/PRE_BUILD | 11
editors/openoffice/getline.patch | 43 +++
libs/libvirt/DEPENDS | 2
libs/libvirt/HISTORY | 3
x11/gtk-vnc/DEPENDS | 7
x11/gtk-vnc/HISTORY | 3
27 files changed, 232 insertions(+), 79 deletions(-)
New commits:
commit 524f010708b2afb2575a6cb0cbca0759b14b1593
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
gtk-vnc: added missing optional dep on LIBSASL
commit c3c746e3170bcb72aa23adee00ce201424fa43d2
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
libvirt: use provider for sasl
commit eeb3b6302e0644d4c2d5f6bf76a8f5ee3826012d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
openoffice: version 3.1.1 and various other fixes. still work in
progress. feel free to join in getting this to work.
commit 6cc038f0a803a87c7001304ec2c59e97453f00d2
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
ptlib: use LIBSASL in SUB_DEPENDS as well
diff --git a/chat-libs/ptlib/HISTORY b/chat-libs/ptlib/HISTORY
index a487f12..9c83561 100644
--- a/chat-libs/ptlib/HISTORY
+++ b/chat-libs/ptlib/HISTORY
@@ -1,3 +1,6 @@
+2009-08-31 Arjan Bouter <abouter AT sourcemage.org>
+ * SUB_DEPENDS: changed cyrus-sasl to LIBSASL
+
2009-07-22 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: changed cyrus-sasl to LIBSASL
diff --git a/chat-libs/ptlib/SUB_DEPENDS b/chat-libs/ptlib/SUB_DEPENDS
index 8b577c1..4d57519 100755
--- a/chat-libs/ptlib/SUB_DEPENDS
+++ b/chat-libs/ptlib/SUB_DEPENDS
@@ -1,4 +1,4 @@
case $THIS_SUB_DEPENDS in
- SASL) depends cyrus-sasl;;
+ SASL) depends LIBSASL ;;
*) echo "unknown sub-depends: ptlib $THIS_SUB_DEPENDS"; return 1 ;;
esac
diff --git a/editors/openoffice/BUILD b/editors/openoffice/BUILD
index 3754e7e..3fe7130 100755
--- a/editors/openoffice/BUILD
+++ b/editors/openoffice/BUILD
@@ -1,11 +1,31 @@
-OPTS="${OPTS} --with-system-libs \
- --with-system-headers \
- --with-system-odbc-headers \
+# --with-vendor=\"Source Mage GNU/Linux\" \
+# --with-build-version="\"$(head -n1 ${SPELL_DIRECTORY}/HISTORY
|awk '{print $2, $3}' )\"" \
+# --with-system-headers \
+# --with-system-libs \
+# --with-system-stdlibs \
+
+OPTS="${OPTS} ${OOO_OPTS}" &&
+if [[ "${OOO_BINFILTER}" = 'n' ]]; then
+ OPTS="${OPTS} --disable-binfilter"
+fi &&
+export PKGFORMAT="installed" &&
+export SRC_ROOT="${SOURCE_DIRECTORY}" &&
+
+cd ${SOURCE_DIRECTORY} &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
--with-dict \
--with-x \
--disable-epm \
--disable-odk \
- --disable-qadevooo" &&
+ --disable-mathmldtd \
+ --disable-qadevooo \
+ --with-vendor="Source\ Mage\ GNU/Linux" \
+ $OPTS &&
-default_build &&
-./bootstrap
+./bootstrap &&
+source Linux*Env.Set.sh &&
+dmake
diff --git a/editors/openoffice/CONFIGURE b/editors/openoffice/CONFIGURE
new file mode 100755
index 0000000..62d78d2
--- /dev/null
+++ b/editors/openoffice/CONFIGURE
@@ -0,0 +1,21 @@
+config_query_option OOO_OPTS "build QuickStart systray plugin?" n \
+ "--enable-systray" \
+ "--disable-systray" &&
+config_query_option OOO_OPTS "enable the Presentation Minimizer extension?"
n \
+ "--enable-minimizer" \
+ "--disable-minimizer" &&
+config_query_option OOO_OPTS "enable the Presenter Console extension?" n \
+ "--enable-presenter-console" \
+ "--disable-presenter-console" &&
+config_query_option OOO_OPTS "enable the Wiki Publisher extension?" n \
+ "--enable-wiki-publisher" \
+ "--disable-wiki-publisher" &&
+config_query_option OOO_OPTS "enable the Report Builder extension?" n \
+ "--enable-report-builder" \
+ "--disable-report-builder" &&
+config_query_option OOO_OPTS "enable the PDF Import extension and Xpdf?" n \
+ "--enable-pdfimport" \
+ "--disable-pdfimport" &&
+config_query_option OOO_OPTS "enable the VBA compatibility feature?" n \
+ "--with-vba-package-format=builtin" \
+ "--disable-vba"
diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index 33c04d8..8244beb 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -1,97 +1,137 @@
-depends tcsh &&
+# good old fashioned hard dependencies, with or without options
depends gmp &&
depends freetype2 &&
-depends zlib &&
depends archive-zip &&
-depends libwpd &&
-depends icu &&
-depends python &&
-depends db &&
-#depends clucene &&
-depends expat &&
-depends libxml2 &&
-depends jpeg &&
-depends openssl &&
+depends zip '--with-zip-home=/usr/bin/zip' &&
+depends unzip '--with-unzip-home=/usr/bin/uzip' &&
+# dependencies that are required but will use local versions when missing
+optional_depends libwpd '--with-system-libwpd' '' 'use system libpwd' &&
+optional_depends icu '--with-system-icu' '' 'use system ICU?' &&
+optional_depends python '--with-system-python' '' 'use system python?' &&
+optional_depends db '--with-system-db' '--without-system-db' 'use system
db?' &&
+#optional_depends lucene '--with-system-lucene' '' 'use system Lucene?' &&
+optional_depends expat '--with-system-expat' '' 'use system expat?' &&
+optional_depends libxml2 '--with-system-libxml' '' 'use system libxml2?
(recommended)' &&
+optional_depends libxslt '--with-system-libxslt' '' 'use system libxslt?
(recommended)' &&
+optional_depends jpeg '--with-system-jpeg' '' 'use system JPEG?' &&
+optional_depends openssl '--with-system-openssl' '' 'use system OpenSSL?
(recommended)' &&
+optional_depends zlib '--with-system-zlib' '' 'use system zlib?
(recommended)' &&
+optional_depends poppler '--with-system-poppler' '' 'use system poppler?'
&&
+optional_depends curl '--with-system-curl' '' 'use system curl?' &&
+optional_depends boost '--with-system-boost' '' 'use system boost?' &&
+optional_depends hunspell '--with-system-hunspell' '' 'enable system
hunspell?' &&
+optional_depends stlport "--with-stlport=${INSTALL_ROOT}/usr"
'--without-stlport' 'use system stlport? (not recommended)' &&
+optional_depends ant "--with-ant-home=${INSTALL_ROOT}/usr" '' 'enable system
ant?' &&
+optional_depends vigra '--with-system-vigra' '--without-system-vigra'
'enable system vigra?' &&
+
+# regular optional dependencies
+optional_depends tcsh \
+ '--with-use-shell=tcsh' \
+ '--with-use-shell=bash' \
+ 'use TCSH instead of BASH (default)' &&
optional_depends ODBC-MGR \
+ '--with-system-odbc --with-system-odbc-headers' \
'' \
- '' \
- 'enable ODBC database access?' &&
+ 'enable ODBC database access? (recommended)' &&
optional_depends JAVA \
- '--with-java' \
+ '--with-java --with-system-jars' \
'--without-java --without-system-jars' \
'enable JAVA support?' &&
+if (is_depends_enabled ${SPELL} JAVA); then
+ optional_depends gcj \
+ '--enable-gcjaot' \
+ '--disable-gcjaot' \
+ 'Build with[out] using Ahead of Time java compilation?'
+fi &&
+optional_depends GTK2 \
+ '--enable-gtk' \
+ '--disable-gtk' \
+ 'use GTK vclplug? (recommended)' &&
+if [[ "$(get_spell_provider ${SPELL} GTK2)" = 'gtk+2' ]] || \
+ [[ "$(get_spell_provider ${SPELL} GTK2)" = 'gtk+2-directfb' ]]; then
optional_depends gconf2 \
'--enable-gconf --enable-lockdown' \
'--disable-gconf --disable-lockdown' \
'enable gconf integration, used for settings and lockdown?'
&&
-# I'm only testing with xulrunner, feel free to add others ;)
-optional_depends xulrunner \
- '--with-system-mozilla=xulrunner' \
- '' \
- "use xulrunner instead of 'strangely hacked up mozilla
binary'?" &&
optional_depends evolution \
'--enable-evolution2' \
'--disable-evolution2' \
'use evolution?' &&
-optional_depends CUPS \
- '--enable-cups --with-ppds' \
- '--disable-cups --without-ppds' \
- 'use CUPS in the psprint project?' &&
-optional_depends fontconfig \
- '--enable-fontconfig' \
- '--disable-fontconfig' \
- 'use fontconfig?' &&
-optional_depends GTK2 \
- '--enable-gtk' \
- '--disable-gtk' \
- 'use GTK vclplug?' &&
+optional_depends gnome-vfs2 \
+ '--enable-gnome-vfs' \
+ '--disable-gnome-vfs' \
+ 'enable GNOME virtual filesystem support?'
+fi &&
+optional_depends kdebase4 \
+ '--enable-kde --enable-kdeab' \
+ '--disable-kde --disable-kdeab' \
+ 'enable KDE addressbook and vclplugin' &&
optional_depends cairo \
- '--enable-cairo' \
- '--enable-cairo' \
- 'use Cairo?' &&
+ '--enable-cairo --with-system-cairo' \
+ '--disable-cairo' \
+ 'use Cairo? (recommended)' &&
optional_depends OPENGL \
'--enable-opengl' \
'--disable-opengl' \
'use OpenGL for 3D effects?' &&
+optional_depends libxrandr \
+ '--enable-randr' \
+ '--disable-randr' \
+ 'enable RandR support in the vcl project?' &&
+optional_depends libxrender \
+ '--with-system-xrender-headers' \
+ '' \
+ 'use system libxrender?' &&
+optional_depends agg \
+ '--with-agg --with-system-agg' \
+ '--without-agg' \
+ 'enable agg support?' &&
+# I'm only testing with xulrunner, feel free to add others ;)
+optional_depends xulrunner \
+ '--disable-mozilla --with-system-mozilla=xulrunner' \
+ '--disable-build-mozilla' \
+ "use xulrunner instead of 'strangely hacked up mozilla
binary'? (recommended)" &&
+#always --without-ppds. not needed without and provided with cups
+optional_depends CUPS \
+ '--enable-cups --without-ppds' \
+ '--disable-cups --without-ppds' \
+ 'use CUPS in the psprint project?' &&
+optional_depends sane-backends \
+ '--with-system-sane-header' \
+ '' \
+ 'use sane backends?' &&
+optional_depends fontconfig \
+ '--enable-fontconfig --disable-fontooo' \
+ '--disable-fontconfig --enable-fontooo' \
+ 'use fontconfig instead of FontOOo?' &&
optional_depends dbus \
'--enable-dbus' \
'--disable-dbus' \
'use D-BUS for screensaver control?' &&
-optional_depends gnome-vfs2 \
- '--enable-gnome-vfs' \
- '--disable-gnome-vfs' \
- 'enable GNOME virtual filesystem support?' &&
#probably wrong, but I have no idea what to include for KDE and which
version ;)
-optional_depends kdebase4 \
- '--enable-kde --enable-kdeab' \
- '--disable-kde --disable-kdeab' \
- 'enable KDE addressbook and vclplugin' &&
optional_depends linux-pam \
- '--enable-pam --enable-pam-link' \
- '--disable-pam --disable-pam-link' \
+ '--enable-pam' \
+ '--disable-pam' \
'use Linux-PAM?' &&
-optional_depends libxrandr \
- '--enable-randr' \
- '--disable-randr' \
- 'enable RandR support in the vcl project?' &&
optional_depends neon \
- '--enable-neon' \
+ '--enable-neon --with-system-neon' \
'--disable-neon' \
'enable neon and the compilation of webdav binding?' &&
optional_depends libxaw \
'--enable-Xaw' \
'--disable-Xaw' \
'enable the use of Xaw for the Netscape/Mozilla plugin?' &&
-optional_depends gcj \
- '--enable-gcjaot' \
- '--disable-gcjaot' \
- 'Build with[out] using Ahead of Time java compilation?' &&
optional_depends openldap \
- '--with-openldap' \
- '--without-openldap' \
- "enable the use of the OpenLDAP LDAP SDK instead of
mozilla's?" &&
+ '--enable-ldap --with-openldap' \
+ '--disable-ldap --without-openldap' \
+ "enable the use of the OpenLDAP LDAP SDK?" &&
+optional_depends rpm \
+ '--enable-epm' \
+ '--disable-epm' \
+ "enable self-packaging code? (not recommended)" &&
+# this one is intentionally reversed
optional_depends ttf-bitstream-vera \
'--without-fonts' \
'--with-fonts' \
- 'use system provided font instead of packaged version?'
+ 'use system provided font instead of packaged version?
(recommended)'
diff --git a/editors/openoffice/DETAILS b/editors/openoffice/DETAILS
index 96386d8..df2035d 100755
--- a/editors/openoffice/DETAILS
+++ b/editors/openoffice/DETAILS
@@ -1,26 +1,30 @@
SPELL=openoffice
- VERSION=3.1.0
- BUILD_VERSION=310_m11
- SOURCE="OOo_${VERSION}_src_binfilter.tar.bz2"
+ VERSION=3.1.1
+ BUILD_VERSION=310_m19
+ SOURCE="OOo_${VERSION}_src_core.tar.bz2"
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
- SOURCE2="OOo_${VERSION}_src_core.tar.bz2"
+ SOURCE2="OOo_${VERSION}_src_extensions.tar.bz2"
SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME"
- SOURCE3="OOo_${VERSION}_src_extensions.tar.bz2"
+ SOURCE3="OOo_${VERSION}_src_system.tar.bz2"
SOURCE3_GPG="gurus.gpg:${SOURCE3}.sig:WORKS_FOR_ME"
SOURCE4="OOo_${VERSION}_src_l10n.tar.bz2"
SOURCE4_GPG="gurus.gpg:${SOURCE4}.sig:WORKS_FOR_ME"
- SOURCE5="OOo_${VERSION}_src_system.tar.bz2"
- SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig:WORKS_FOR_ME"
- SOURCE6="OOo_${VERSION}_src_testautomation.tar.bz2"
- SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig:WORKS_FOR_ME"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO${BUILD_VERSION}
COMMON_PATH=openoffice/stable/${VERSION}
SOURCE_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE}
SOURCE2_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE2}
SOURCE3_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE3}
SOURCE4_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE4}
+if [[ "${OOO_BINFILTER}" = 'y' ]]; then
+ SOURCE5="OOo_${VERSION}_src_binfilter.tar.bz2"
+ SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig:WORKS_FOR_ME"
SOURCE5_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE5}
+fi &&
+if [[ "${OOO_TEST}" = 'y' ]]; then
+ SOURCE6="OOo_${VERSION}_src_testautomation.tar.bz2"
+ SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig:WORKS_FOR_ME"
SOURCE6_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE6}
+fi &&
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO${BUILD_VERSION}
LICENSE[0]=LGPL
WEB_SITE=http://www.openoffice.org
ENTERED=20080909
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index a1371b2..ca0e852 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,7 @@
+2009-08-31 Arjan Bouter <abouter AT sourcemage.org>
+ * version 3.1.1 and various other fixes.
+ still work in progress.
+
2009-08-03 Arjan Bouter <abouter AT sourcemage.org>
* recreated spell for OOo 3.1.0
diff --git a/editors/openoffice/OOo_3.1.0_src_binfilter.tar.bz2.sig
b/editors/openoffice/OOo_3.1.0_src_binfilter.tar.bz2.sig
deleted file mode 100644
index a4ed479..0000000
Binary files a/editors/openoffice/OOo_3.1.0_src_binfilter.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.0_src_core.tar.bz2.sig
b/editors/openoffice/OOo_3.1.0_src_core.tar.bz2.sig
deleted file mode 100644
index 5884f33..0000000
Binary files a/editors/openoffice/OOo_3.1.0_src_core.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.0_src_extensions.tar.bz2.sig
b/editors/openoffice/OOo_3.1.0_src_extensions.tar.bz2.sig
deleted file mode 100644
index 7c911e6..0000000
Binary files a/editors/openoffice/OOo_3.1.0_src_extensions.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.0_src_l10n.tar.bz2.sig
b/editors/openoffice/OOo_3.1.0_src_l10n.tar.bz2.sig
deleted file mode 100644
index b1c8275..0000000
Binary files a/editors/openoffice/OOo_3.1.0_src_l10n.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.0_src_system.tar.bz2.sig
b/editors/openoffice/OOo_3.1.0_src_system.tar.bz2.sig
deleted file mode 100644
index 1ffee56..0000000
Binary files a/editors/openoffice/OOo_3.1.0_src_system.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.0_src_testautomation.tar.bz2.sig
b/editors/openoffice/OOo_3.1.0_src_testautomation.tar.bz2.sig
deleted file mode 100644
index a14ea5d..0000000
Binary files a/editors/openoffice/OOo_3.1.0_src_testautomation.tar.bz2.sig
and /dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig
new file mode 100644
index 0000000..bc60eab
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig
new file mode 100644
index 0000000..0675bf7
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig
new file mode 100644
index 0000000..249e7df
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig
new file mode 100644
index 0000000..766fd83
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig
new file mode 100644
index 0000000..7126f52
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig
new file mode 100644
index 0000000..7db0c77
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig differ
diff --git a/editors/openoffice/PREPARE b/editors/openoffice/PREPARE
new file mode 100755
index 0000000..89c9577
--- /dev/null
+++ b/editors/openoffice/PREPARE
@@ -0,0 +1,2 @@
+config_query OOO_BINFILTER 'enable legacy binary file formats filters?' n
&&
+config_query OOO_TEST 'enable testautomation?' n
diff --git a/editors/openoffice/PRE_BUILD b/editors/openoffice/PRE_BUILD
index 92d850f..d0448e0 100755
--- a/editors/openoffice/PRE_BUILD
+++ b/editors/openoffice/PRE_BUILD
@@ -3,6 +3,11 @@ unpack_file &&
unpack_file '2' &&
unpack_file '3' &&
unpack_file '4' &&
-unpack_file '5' &&
-unpack_file '6' &&
-cd ${SOURCE_DIRECTORY}
+if [[ "${OOO_BINFILTER}" = 'y' ]]; then
+ unpack_file '5'
+fi &&
+if [[ "${OOO_TEST}" = 'y' ]]; then
+ unpack_file '6'
+fi &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SPELL_DIRECTORY}/getline.patch
diff --git a/editors/openoffice/getline.patch
b/editors/openoffice/getline.patch
new file mode 100644
index 0000000..74420f7
--- /dev/null
+++ b/editors/openoffice/getline.patch
@@ -0,0 +1,43 @@
+--- soltools/mkdepend/def.h.orig 2009-05-18 15:28:59.000000000 +0200
++++ soltools/mkdepend/def.h 2009-05-18 15:29:36.000000000 +0200
+@@ -154,7 +154,7 @@
+
+ char *copy();
+ char *base_name();
+-char *getline();
++char *ooo_getline();
+ char *isdefined();
+ struct filepointer *getfile();
+ struct inclist *newinclude();
+--- soltools/mkdepend/main.c.orig 2009-05-18 15:29:08.000000000 +0200
++++ soltools/mkdepend/main.c 2009-05-18 15:30:23.000000000 +0200
+@@ -548,7 +548,7 @@
+ * Get the next line. We only return lines beginning with '#' since that
+ * is all this program is ever interested in.
+ */
+-char *getline(filep)
++char *ooo_getline(filep)
+ register struct filepointer *filep;
+ {
+ register char *p, /* walking pointer */
+--- soltools/mkdepend/parse.c.orig 2009-05-18 15:29:17.000000000 +0200
++++ soltools/mkdepend/parse.c 2009-05-18 15:30:43.000000000 +0200
+@@ -45,7 +45,7 @@
+ register int type;
+ boolean recfailOK;
+
+- while ((line = getline(filep))) {
++ while ((line = ooo_getline(filep))) {
+ switch(type = deftype(line, filep, file_red, file, TRUE,
symbols)) {
+ case IF:
+ doif:
+@@ -168,7 +168,7 @@
+ register char *line;
+ register int type;
+
+- while ((line = getline(filep))) {
++ while ((line = ooo_getline(filep))) {
+ switch(type = deftype(line, filep, file_red, file, FALSE,
symbols)) {
+ case IF:
+ case IFFALSE:
+
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
index fcbe3ab..eca969d 100755
--- a/libs/libvirt/DEPENDS
+++ b/libs/libvirt/DEPENDS
@@ -8,7 +8,7 @@ optional_depends avahi \
'--without-avahi' \
'for Avahi remote daemon advertising' &&
-optional_depends cyrus-sasl \
+optional_depends LIBSASL \
'--with-sasl' \
'--without-sasl' \
'for Cyrus SASL authentication support' &&
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index a99c38a..e4898e2 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,6 @@
+2009-08-31 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: changed cyrus-sasl to LIBSASL
+
2009-02-25 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depends on kvm, lvm, and parted
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 753cac3..896a217 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -8,4 +8,9 @@ optional_depends python \
optional_depends NS-PLUGIN-COMPATIBLE \
'--enable-plugin=yes' \
'--enable-plugin=no' \
- 'for web browser plugin'
+ 'for web browser plugin' &&
+
+optional_depends LIBSASL \
+ '--with-sasl' \
+ '--without-sasl' \
+ 'for SASL authentication support'
diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index 5986d3b..644db39 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,3 +1,6 @@
+2009-08-31 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: optionally depend on LIBSASL
+
2009-08-20 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply npupp-bug15358.patch
* npupp-bug15358.patch: Fixes Bug #15358
- [SM-Commit] GIT changes to master grimoire by Arjan Bouter (eb26d7e0e990372973bf59c496fdf1b2083515c1), Arjan Bouter, 08/31/2009
Archive powered by MHonArc 2.6.24.