Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (842ae83bd0b59320cf60eae62559ee4eb76a5772)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (842ae83bd0b59320cf60eae62559ee4eb76a5772)
  • Date: Mon, 3 Aug 2009 20:20:42 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

dev/null |binary
editors/openoffice/BUILD | 54 --
editors/openoffice/CONFIGURE | 69 --
editors/openoffice/CONFLICTS | 5
editors/openoffice/DEPENDS | 283
++++--------
editors/openoffice/DETAILS | 100 +---
editors/openoffice/HISTORY | 3
editors/openoffice/INSTALL | 5
editors/openoffice/OOo_3.1.0_src_binfilter.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.0_src_core.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.0_src_extensions.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.0_src_l10n.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.0_src_system.tar.bz2.sig |binary
editors/openoffice/OOo_3.1.0_src_testautomation.tar.bz2.sig |binary
editors/openoffice/POST_REMOVE | 8
editors/openoffice/PREPARE | 15
editors/openoffice/PRE_BUILD | 48 --
editors/openoffice/heap_overflow.patch | 11
editors/openoffice/javafix.diff | 19
editors/openoffice/process.c.patch | 11
gnome2-libs/gnome-common2/HISTORY | 3
gnome2-libs/gnome-common2/PRE_BUILD | 3
gnome2-libs/gnome-common2/gnome-autogen.patch | 31 +
java/kaffe/DEPENDS | 23
java/kaffe/DETAILS | 4
java/kaffe/HISTORY | 4
shell-term-fm/tcsh/DETAILS | 3
shell-term-fm/tcsh/tcsh-6.16.00.tar.gz.sig | 0
shell-term-fm/tcsh/tcsh-6.17.00.tar.gz.sig |binary
29 files changed, 225 insertions(+), 477 deletions(-)

New commits:
commit f0b5f14b5dd0e615829995e34ad8ad9f86fbe68e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

openoffice: taking a shot at openoffice 3.1.0 WORK IN PROGRESS

commit 6169af31ab595a0c2ff80d068557feb295f442be
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

kaffe: version 1.1.9

commit bdacb6a4d4820e7d27b52fa0a5d614c8d18067ed
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

gnome-common2: add the patch

commit c170128b186c4150939b124ecbbfe7867780216c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

tcsh: version 6.17

commit c0d7403d019f519957c973d3868f0960a1799011
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

gnome-common2: explained automake 1.11 to gnome-autogen.sh

diff --git a/editors/openoffice/BUILD b/editors/openoffice/BUILD
index 182c658..3754e7e 100755
--- a/editors/openoffice/BUILD
+++ b/editors/openoffice/BUILD
@@ -1,45 +1,11 @@
-if [ "$OPENOFFICE_VERSION" == "stable" ]; then
-optimize
-fi
+OPTS="${OPTS} --with-system-libs \
+ --with-system-headers \
+ --with-system-odbc-headers \
+ --with-dict \
+ --with-x \
+ --disable-epm \
+ --disable-odk \
+ --disable-qadevooo" &&

-
-### configure
- cd $SOURCE_DIRECTORY/config_office/ &&
- export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -I/usr/include/nspr
-I/usr/include/nss" &&
-export CFLAGS="${CFLAGS} -I/usr/include/nspr -I/usr/include/nss" &&
-if [ "$OPENOFFICE_VERSION" == "stable" ]; then
-optimize
-fi
-if [ "$OPENOFFICE_EPM" == "internal" ]; then
-OPTS="${OPTS} --enable-epm --with-epm=internal"
-fi
-if [ "$OPENOFFICE_EPM" == "none" ]; then
-OPTS="${OPTS} --disable-epm"
-fi
-if [ "$OPENOFFICE_VERSION" == "devel" ]; then
-OPTS="${OPTS} --with-build-version=Built_by_Source_Mage"
-fi
-echo OPTS=$OPTS &&
- ./configure \
- --with-lang=${LANGUAGE} \
- --with-dict=${DICTIONARY} \
- --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- --disable-mozilla \
- $OPENOFFICE_OPTS $OPTS &&
-
- cd $SOURCE_DIRECTORY &&
- ./bootstrap
&&
- tcsh -c "source LinuxIntelEnv.Set && \
- env && \
- dmake" &&
-if [ "$OPENOFFICE_VERSION" == "stable" ]; then
- cd $SOURCE_DIRECTORY/instsetoo/unxlngi4.pro/01/normal
&&
- sedit "s:oo_home=OpenOffice.org${VERSION}:oo_home=openoffice:" install
&&
- chmod +x install
-else
-echo "build done"
-fi
+default_build &&
+./bootstrap
diff --git a/editors/openoffice/CONFIGURE b/editors/openoffice/CONFIGURE
deleted file mode 100755
index 291226b..0000000
--- a/editors/openoffice/CONFIGURE
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-get_oolanguages() {
- local i LANGUAGE LANGUAGES DICTIONARY DICTIONARIES &&
- if [ "$OO_CONFIGURE" = "y" ]
- then
- rm -f $CFG &&
- touch $CFG &&
- LANGUAGES=`cat $SCRIPT_DIRECTORY/oo.languages` &&
- LANGUAGES=`dialog --backtitle "Open Office Language Menu" \
- --stdout \
- --title "Select language please" \
- --checklist \
- "" \
- 0 50 10 \
- $LANGUAGES` &&
-
- i=1 &&
- for LANGUAGE in $LANGUAGES
- do
- # BUG HERE LANGUAGE=${LANGUAGE:1:${#LANGUAGE}-2}
- LANGUAGE=`echo $LANGUAGES|sed 's:"::g'` &&
- if [[ $i == 1 ]]
- then
- LANGUAGE=`echo $LANGUAGES|sed 's:"::g'`
- fi &&
- i=$[$i+1]
- done
- DICTIONARIES=`cat $SCRIPT_DIRECTORY/oo.dict` &&
- DICTIONARIES=`dialog --backtitle "Open Office Dictionary Menu" \
- --stdout \
- --title "Select dictionary please" \
- --checklist \
- "" \
- 0 50 10 \
- $DICTIONARIES` &&
- i=1 &&
- for DICTIONARY in $DICTIONARIES
- do
- # BUG HERE DICTIONARY=${DICTIONARY:1:${#DICTIONARY}-2}
- DICTIONARY=`echo $DICTIONARIES|sed 's:"::g'` &&
- if [[ $i == 1 ]]
- then
- DICTIONARY=`echo $DICTIONARIES|sed 's:"::g'`
- fi &&
- i=$[$i+1]
- done
- else
- message "${MESSAGE_COLOR}Using existing config${DEFAULT_COLOR}"
- fi
-
-echo LANGUAGE=$LANGUAGE >> $CFG
-echo DICTIONARY=$DICTIONARY >> $CFG
-
-}
-
-
-if [ "$OPENOFFICE_VERSION" != "stable" ]; then
- CFG=$SPELL_CONFIG
-
- config_query OO_CONFIGURE "Reconfigure?" n &&
- get_oolanguages
-
- . $CFG
-config_query_list OPENOFFICE_EPM "OO.o includes some self packaging code,
that requires epm, however epm is useless for large scale package building."
external internal none
-else
- LANGUAGE=ALL
- DICTIONARY=ALL
-fi
-
diff --git a/editors/openoffice/CONFLICTS b/editors/openoffice/CONFLICTS
index 4f3fd28..67fa1b1 100755
--- a/editors/openoffice/CONFLICTS
+++ b/editors/openoffice/CONFLICTS
@@ -1 +1,4 @@
-conflicts openoffice-bin
+conflicts openoffice &&
+conflicts openoffice-bin &&
+conflicts openoffice2-bin &&
+conflicts openoffice3-bin
diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index edc609f..33c04d8 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -1,186 +1,97 @@
-if [ "$OPENOFFICE_VERSION" == "cvs" ]; then
-depends CVS
-fi
-if [ "$OPENOFFICE_VERSION" != "stable" ]; then
-depends g++
-depends archive-zip
-else
-depends gcc33
-fi
-depends xorg-server "--with-x" &&
-depends zip &&
-depends unzip &&
-depends which &&
-depends ant "--with-ant-home=${ANT_HOME}" &&
-depends libart_lgpl "--enable-libart" &&
-depends bison &&
-
-# optional now?
-depends zlib "--with-system-zlib" &&
-depends LINUX-PAM-HEADERS &&
-
-# is this the key to using bash?
-depends tcsh &&
-#optional_depends "tcsh" \
-# "--with-use-shell=/usr/bin/tcsh" \
-# "--with-use-shell=/bin/bash" \
-# "Use tcsh shell for compiling (safer)" &&
-
-if [ $OPENOFFICE_VERSION != "stable" ]; then
-depends "JAVA" "--enable-java --with-jdk-home=${JAVA_HOME}" ''
'z-rejected'
-else
-optional_depends 'JAVA-1.4' \
- "--enable-java --with-jdk-home=${JAVA_HOME}" \
- '--disable-java' \
- 'To enable java support' \
- 'z-rejected'
-fi
-#
-# We now have stlport 5 in the grimoire
-# This will no longer work
-#
-#optional_depends stlport \
-# "--with-stlport4-home=/usr" \
-# "" \
-# "to use system installed STLport" &&
-
-optional_depends startup-notification \
- "--enable-libsn" \
- "" \
- "for startup notification" &&
-
-#
-# Yes, this is the correct --enable/disable order. :)
-#
-# From `./configure --help`:
-# --disable-mozilla OO.o usually includes a strangely hacked up
mozilla
-# binary for your platform, to build without this
-# version, use this option.
-#
-if [ "$OPENOFFICE_VERSION" == "stable" ]; then
-# broken for the 2.0 branch
-optional_depends GRAPHICAL-WEB-BROWSER \
- "--disable-mozilla" \
- "" \
- "for a normal web browser"
-fi &&
-
-#
-# Passing --without-system-<lib> still /enables/ the system lib
-# use as OO's configure is stupid and just greps for "system-lib"
-#
-optional_depends curl \
- "--with-system-curl" \
- "" \
- "for up-to-date curl" &&
-
-optional_depends freetype2 \
- "--with-system-freetype --without-fonts" \
- "" \
- "for up-to-date freetype2" &&
-
-#
-# configure is looking for the nas headers in
-# /usr/include/audio
-# but nas installs the headers to
-# /usr/X11R6/include/audio
-#
-optional_depends nas \
- "--with-system-nas" \
- "" \
- "for up-to-date Network Audio System" &&
-
-if [ "$OPENOFFICE_VERSION" != "stable" ]; then
-
-#
-# For both gtk and kde-base, this spell requires
-# 8gb+ space to compile.
-#
-# Say "NO"
-# "Yes is broken"
-#
-#
-#optional_depends gtk+2 \
-# "--enable-gtk" \
-# "--disable-gtk" \
-# "Determines whether to use Gtk+ vclplug on platforms
where Gtk+ is available." &&
-#
-#optional_depends gnome-vfs2 \
-# "--enable-gnome-vfs" \
-# "--disable-gnome-vfs" \
-# "Determines whether to use the Gnome Virtual Filing
System on platforms where that VFS is available" &&
-#
-# I'm not sure which kde level it really needs
-# kdebase
-# kdelibs
-# qt-x11
-#
-#optional_depends kdebase \
-# "--enable-kde" \
-# "--disable-kde" \
-# "Determines whether to use Qt/KDE vclplug on platforms
where Qt and KDE are available." &&
-
-optional_depends openldap \
- "--enable-openldap" \
- "" \
- "Enables the use of the OpenLDAP LDAP SDK instead of the
Netscape/Mozilla one" &&
-
-optional_depends CUPS \
- "--enable-cups" \
- "" \
- "enable cups support in the psprint project" &&
-
-optional_depends jpeg \
- "--with-system-jpg" \
- "" \
- "Use jpeg already on system" &&
-
-optional_depends expat \
- "--with-system-expat" \
- "" \
- "Use expat already on system" &&
-
-#
-# Appears to be broken
-#
-#optional_depends libxml2 \
-# "--with-system-libxml" \
-# "" \
-# "Use libxml already on system" &&
-
-optional_depends python \
- "--with-system-python" \
- "" \
- "Use python already on system" &&
-
-optional_depends sablot \
- "--with-system-sablot" \
- "" \
- "Use sablot already on system" &&
-
-optional_depends unixodbc \
- "--with-system-odbc-headers" \
- "" \
- "Use the odbc headers already on system" &&
-
-optional_depends boost \
- "--with-system-boost" \
- "" \
- "Use boost already on system" &&
-
-optional_depends neon \
- "--with-system-neon" \
- "" \
- "for up-to-date neon"
-
-#
-# What is epm?
-# Where does one get it?#
-#
-if [ "$OPENOFFICE_EPM" == "external" ]; then
-depends epm "--enable-epm"
-fi
-if [ "$OPENOFFICE_EPM" != "none" ]; then
-depends rpm
-fi
-fi
+depends tcsh &&
+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 &&
+
+optional_depends ODBC-MGR \
+ '' \
+ '' \
+ 'enable ODBC database access?' &&
+optional_depends JAVA \
+ '--with-java' \
+ '--without-java --without-system-jars' \
+ 'enable JAVA support?' &&
+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 cairo \
+ '--enable-cairo' \
+ '--enable-cairo' \
+ 'use Cairo?' &&
+optional_depends OPENGL \
+ '--enable-opengl' \
+ '--disable-opengl' \
+ 'use OpenGL for 3D effects?' &&
+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' \
+ 'use Linux-PAM?' &&
+optional_depends libxrandr \
+ '--enable-randr' \
+ '--disable-randr' \
+ 'enable RandR support in the vcl project?' &&
+optional_depends neon \
+ '--enable-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?" &&
+optional_depends ttf-bitstream-vera \
+ '--without-fonts' \
+ '--with-fonts' \
+ 'use system provided font instead of packaged version?'
diff --git a/editors/openoffice/DETAILS b/editors/openoffice/DETAILS
index 27606de..96386d8 100755
--- a/editors/openoffice/DETAILS
+++ b/editors/openoffice/DETAILS
@@ -1,64 +1,44 @@
- SPELL=openoffice
-if [ "$OPENOFFICE_VERSION" == "devel" ]; then
- VERSION=2.0beta2
-# VERSION2=m`echo ${VERSION} | cut -d. -f3`
- SOURCE=OOo_${VERSION}_src.tar.gz
- SOURCE_URL[0]=ftp://openoffice.mirrors.pair.com/stable/2.0beta2/$SOURCE
-
SOURCE_URL[1]=ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/stable/${VERSION}/$SOURCE
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOo_${VERSION}
- MD5[0]=b45a6b8400bfca4b72497a6fb341a797
-else
- VERSION=1.1.5
- SOURCE=OOo_${VERSION}_src.tar.gz
- SOURCE_HASH=sha1:55b316209eaabf151a59ead2abc3c621502058ea
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOo_${VERSION}
-SOURCE_URL[0]=http://openoffice.mirrors.pair.com/ftp/stable/$VERSION/$SOURCE
-
SOURCE_URL[1]=http://www.mirror.ac.uk/mirror/sunsite.dk/openoffice/stable/$VERSION/$SOURCE
-
SOURCE_URL[2]=http://www.ring.gr.jp/archives/misc/openoffice/stable/$VERSION/$SOURCE
- GCC_VERSION=3.3
-fi
- WEB_SITE=http://www.openoffice.org/
- LICENSE[0]=GPL
- ENTERED=20021127
- UPDATED=20050122
- CCACHE=off
- MAKE_NJOBS=1
- BUILD_API=2
- TMPFS=off
- KEYWORDS="editors"
- SHORT="Popular Open Source office productivity suite."
+ SPELL=openoffice
+ VERSION=3.1.0
+ BUILD_VERSION=310_m11
+ SOURCE="OOo_${VERSION}_src_binfilter.tar.bz2"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ SOURCE2="OOo_${VERSION}_src_core.tar.bz2"
+ SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME"
+ SOURCE3="OOo_${VERSION}_src_extensions.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}
+ SOURCE5_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE5}
+ SOURCE6_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE6}
+ LICENSE[0]=LGPL
+ WEB_SITE=http://www.openoffice.org
+ ENTERED=20080909
+ ARCHIVE="off"
+ SHORT="The binary version of OpenOffice 3"
cat << EOF
-OpenOffice.org gives you everything you'd expect in office software. You
-can create dynamic documents, analyse data, design eye-catching
-presentations, produce dramatic illustrations, and open up your databases.
-You can publish your work in Portable Document Format (.pdf), and release
-your graphics in Flash (.swf) format - without needing any additional
-software. OpenOffice.org is now available for more users than ever, with
-support for complex text layout (CTL) languages (such as Thai, Hindi,
-Arabic, and Hebrew) and vertical writing languages.
+OpenOffice.org is the open source project through which Sun Microsystems has
+released the technology for the popular StarOffice[tm] Productivity Suite.
+All of the StarOffice code is available under the GNU Lesser General Public
+License (LGPL) as well as the Sun Industry Standards Source License (SISSL).

- What's in the suite?
+Sun is participating as a member of the OpenOffice.org community.
+OpenOffice.org is being hosted by CollabNet.

-WRITER Is a powerful tool for creating professional documents, reports,
-newsletters, and brochures. You can easily integrate images and charts in
-documents, create everything from business letters to complete books with
-professional layouts, as well as create and publish Web content.
-
-CALC is a feature-packed spreadsheet which can turn boring numbers into
-eye-catching information. Calculate, analyse, and visually communicate your
-data quickly and easily. Use advanced spreadsheet functions and
-decision-making tools to perform sophisticated data analysis. Use built-in
-charting tools to generate impressive 2D and 3D charts.
-
-IMPRESS is the fastest, most powerful way to create effective multimedia
-presentations. Your presentations will truly stand out with special
-effects, animation and high-impact drawing tools.
-
-DRAW will produce everything from simple diagrams to dynamic 3D
-illustrations and special effects.
-
-The Database User Tools give you all the tools you need for day to day
-database work in a simple spreadsheet-like form. They support dBASE
-databases for simple applications, or any ODBC or JDBC compliant database
-for industrial strength database work.
+The suite includes:
+scalc - A spreadsheet application
+sdraw - A vector drawing program
+simpress - A presentation program
+smath - An equation editor
+swriter - A word processor
EOF
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index d94b95d..a1371b2 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,6 @@
+2009-08-03 Arjan Bouter <abouter AT sourcemage.org>
+ * recreated spell for OOo 3.1.0
+
2008-07-21 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: long desc -> 75 col

diff --git a/editors/openoffice/INSTALL b/editors/openoffice/INSTALL
deleted file mode 100755
index 20d82d1..0000000
--- a/editors/openoffice/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
- ./install --prefix=/opt
&&
- for APP in swriter scalc sdraw simpress smath soffice
- do rm -f /usr/bin/$APP &&
- ln -sf $TRACK_ROOT/opt/openoffice/program/$APP /usr/bin/$APP
- done
\ No newline at end of file
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
new file mode 100644
index 0000000..a4ed479
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.0_src_binfilter.tar.bz2.sig 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
new file mode 100644
index 0000000..5884f33
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.0_src_core.tar.bz2.sig 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
new file mode 100644
index 0000000..7c911e6
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.0_src_extensions.tar.bz2.sig 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
new file mode 100644
index 0000000..b1c8275
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.0_src_l10n.tar.bz2.sig 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
new file mode 100644
index 0000000..1ffee56
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.0_src_system.tar.bz2.sig 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
new file mode 100644
index 0000000..a14ea5d
Binary files /dev/null and
b/editors/openoffice/OOo_3.1.0_src_testautomation.tar.bz2.sig differ
diff --git a/editors/openoffice/POST_REMOVE b/editors/openoffice/POST_REMOVE
deleted file mode 100755
index da77efb..0000000
--- a/editors/openoffice/POST_REMOVE
+++ /dev/null
@@ -1,8 +0,0 @@
-# Remove stuff that was installed by "setup" - this can't be tracked
-# by installwatch :o(
-
-for LINK in "scalc sdraw simpress smath soffice spadmin sweb swriter"; do
- rm -f /usr/bin/$LINK;
-done
-
-rm -rf /opt/openoffice
diff --git a/editors/openoffice/PREPARE b/editors/openoffice/PREPARE
deleted file mode 100755
index 34a1d15..0000000
--- a/editors/openoffice/PREPARE
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Setup ANT_HOME and JAVA_HOME in case they were just installed
-#
-if [ -f /etc/profile.d/java.sh ]; then
- source /etc/profile.d/java.sh
-fi &&
-
-if [ -f /etc/profile.d/ant.sh ]; then
- source /etc/profile.d/ant.sh
-fi
-
-#config_query_list OPENOFFICE_VERSION "Which version do you wish to use?
(Use stable unless you want to actively help get this working, or are just
plain crazy)" devel stable
-
-persistent_add OPENOFFICE_VERSION &&
-OPENOFFICE_VERSION=stable
diff --git a/editors/openoffice/PRE_BUILD b/editors/openoffice/PRE_BUILD
index 7fc460b..92d850f 100755
--- a/editors/openoffice/PRE_BUILD
+++ b/editors/openoffice/PRE_BUILD
@@ -1,40 +1,8 @@
-if [ "$OPENOFFICE_VERSION" != "stable" ]; then
- mk_source_dir $SOURCE_DIRECTORY 4g &&
- unpack_file &&
- cd $SOURCE_DIRECTORY &&
-#
-# Apply Patches, hopefully to be fixed before the final release.
-#
- echo "Applying Patches" &&
-# cd xmloff/source/draw/ &&
- patch -p1 < $SCRIPT_DIRECTORY/process.c.patch
-# cd $SOURCE_DIRECTORY
-else
- mk_source_dir $SOURCE_DIRECTORY 4g &&
- unpack_file '' &&
- invoke_gcc &&
-
-# set OO to use our optimizations
-#
- cd $SOURCE_DIRECTORY &&
- sedit "s:^CFLAGSOPT=.*:CFLAGSOPT=$CFLAGS:g" solenv/inc/unxlngi3.mk &&
- sedit "s:\-mcpu-pentiumpro::" solenv/inc/unxlngi4.mk &&
- sedit "s:^CFLAGSOPT=.*:CFLAGSOPT=$CFLAGS:g" solenv/inc/unxlngi4.mk
-
-
-fi &&
-# fix db java problem
-#
-# This looks ugly
-#
-# Apply to 2.0 now?
-#
-#
- cd $SOURCE_DIRECTORY/berkeleydb/download/ &&
- tar -xzf db-4.2.52.NC.tar.gz &&
- mv db-4.2.52.NC db &&
- patch -p0 < $SCRIPT_DIRECTORY/javafix.diff &&
- mv db db-4.2.52.NC &&
- tar -czf db-4.2.52.NC.tar.gz db-4.2.52.NC &&
- rm -rf db-4.2.52.NC &&
- cd $SOURCE_DIRECTORY
+cd ${BUILD_DIRECTORY} &&
+unpack_file &&
+unpack_file '2' &&
+unpack_file '3' &&
+unpack_file '4' &&
+unpack_file '5' &&
+unpack_file '6' &&
+cd ${SOURCE_DIRECTORY}
diff --git a/editors/openoffice/heap_overflow.patch
b/editors/openoffice/heap_overflow.patch
deleted file mode 100644
index bcf423f..0000000
--- a/editors/openoffice/heap_overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4
-+++ sot/source/sdstor/stgole.cxx 12 Apr 2005 10:14:48 -0000
-@@ -157,7 +157,7 @@ BOOL StgCompObjStream::Load()
- INT32 nLen1 = 0;
- *this >> nLen1;
- sal_Char* p = new sal_Char[ (USHORT) nLen1 ];
-- if( Read( p, nLen1 ) == (ULONG) nLen1 )
-+ if( Read( p, (USHORT) nLen1 ) == (ULONG) nLen1 )
- {
- aUserName = String( p, gsl_getSystemTextEncoding() );
- /* // Now we can read the CB format
diff --git a/editors/openoffice/javafix.diff b/editors/openoffice/javafix.diff
deleted file mode 100644
index 6b68f9e..0000000
--- a/editors/openoffice/javafix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -purN db-4.2.50/dist/configure db/dist/configure
---- db-4.2.50/dist/configure 2003-11-20 22:05:57.000000000 -0500
-+++ db/dist/configure 2003-11-26 15:38:43.000000000 -0500
-@@ -20729,7 +20729,6 @@ public static void main (String args[])
- System.exit (0);
- } }
- EOF
--if test x$ac_cv_prog_uudecode_base64 != xyes; then
- if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -20744,7 +20743,6 @@ if test x$ac_cv_prog_uudecode_base64 !=
- echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check
the CLASSPATH?)" >&2;}
- { (exit 1); exit 1; }; }
- fi
--fi
- if { ac_try='$JAVA $JAVAFLAGS $TEST'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
diff --git a/editors/openoffice/process.c.patch
b/editors/openoffice/process.c.patch
deleted file mode 100644
index 69c33e7..0000000
--- a/editors/openoffice/process.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openoffice-cvs/sal/osl/unx/process.c.~1.35.~ 2004-10-28
12:25:13.000000000 -0400
-+++ openoffice-cvs/sal/osl/unx/process.c 2005-04-24 11:56:26.000000000
-0400
-@@ -536,7 +536,7 @@
- #if defined(LINUX)
- /* mfe: linux likes to have just one thread when the exec
family is called */
- /* this np function has this purpose ...
*/
-- pthread_kill_other_threads_np();
-+ /* pthread_kill_other_threads_np(); */
- #endif
- OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
-
diff --git a/gnome2-libs/gnome-common2/HISTORY
b/gnome2-libs/gnome-common2/HISTORY
index 6faa274..a878080 100644
--- a/gnome2-libs/gnome-common2/HISTORY
+++ b/gnome2-libs/gnome-common2/HISTORY
@@ -1,3 +1,6 @@
+2009-08-03 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: added to teach gnome-autogen.sh about automake 1.11
+
2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.26.0

diff --git a/gnome2-libs/gnome-common2/PRE_BUILD
b/gnome2-libs/gnome-common2/PRE_BUILD
new file mode 100755
index 0000000..5459a2f
--- /dev/null
+++ b/gnome2-libs/gnome-common2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/gnome-autogen.patch
diff --git a/gnome2-libs/gnome-common2/gnome-autogen.patch
b/gnome2-libs/gnome-common2/gnome-autogen.patch
new file mode 100644
index 0000000..8a77f46
--- /dev/null
+++ b/gnome2-libs/gnome-common2/gnome-autogen.patch
@@ -0,0 +1,31 @@
+--- macros2/gnome-autogen.sh.orig 2009-03-19 21:08:16.000000000 +0100
++++ macros2/gnome-autogen.sh 2009-08-03 23:35:15.426146020 +0200
+@@ -7,7 +7,7 @@
+
+ # default version requirements ...
+ REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53}
+-REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.9}
++REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.11}
+ REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3}
+ REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40}
+ REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0}
+@@ -310,12 +310,13 @@
+
+ case $REQUIRED_AUTOMAKE_VERSION in
+ 1.4*) automake_progs="automake-1.4" ;;
+- 1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8
automake-1.7 automake-1.6 automake-1.5" ;;
+- 1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8
automake-1.7 automake-1.6" ;;
+- 1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8
automake-1.7" ;;
+- 1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
+- 1.9*) automake_progs="automake-1.10 automake-1.9" ;;
+- 1.10*) automake_progs="automake-1.10" ;;
++ 1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9
automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++ 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9
automake-1.8 automake-1.7 automake-1.6" ;;
++ 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9
automake-1.8 automake-1.7" ;;
++ 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9
automake-1.8" ;;
++ 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
++ 1.10*) automake_progs="automake-1.11 automake-1.10" ;;
++ 1.11*) automake_progs="automake-1.11" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs"
$REQUIRED_AUTOMAKE_VERSION \
+
"http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz";
diff --git a/java/kaffe/DEPENDS b/java/kaffe/DEPENDS
index 08920db..dbec0f3 100755
--- a/java/kaffe/DEPENDS
+++ b/java/kaffe/DEPENDS
@@ -1,4 +1,19 @@
-optional_depends "gmp" \
- "" \
- "--enable-pure-java-math" \
- "for large number support"
+depends jpeg &&
+depends giflib &&
+depends libpng &&
+optional_depends gcj \
+ '--enable-gcj' \
+ '--disable-gcj' \
+ 'enable gcj support?' &&
+optional_depends zlib \
+ '--enable-zlib-zip' \
+ '--disable-zlib-zip' \
+ 'enable java.util.zip implementation using zlib?' &&
+optional_depends libffi \
+ '--enable-libffi' \
+ '--disable-libffi' \
+ 'use libffi for sysdepCallMethod?' &&
+optional_depends X11-LIBS \
+ '--with-x' \
+ '--without-x' \
+ 'enable X11 support?'
diff --git a/java/kaffe/DETAILS b/java/kaffe/DETAILS
index 3e776e6..3134b64 100755
--- a/java/kaffe/DETAILS
+++ b/java/kaffe/DETAILS
@@ -1,9 +1,9 @@
SPELL=kaffe
- VERSION=1.1.4
+ VERSION=1.1.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/$SOURCE
-
SOURCE_HASH=sha512:83b14a3958b7231be92be2693c7121f8fba625d9ab94badc3242a0aa555276871f4b040077a273ca50cc72938d5e3e2d1f4ecccc7f45e8832c6d6df4317eb726
+
SOURCE_HASH=sha512:551189bdc056fb37967a1262ff67dbdad5936dca25fca4304e74bc1e0e4c4efdcdcbf98f03148d98a27bd82c5a020522d5cf5db8cce2ddf8e046f6f2325f684d
LICENSE[0]=GPL
WEB_SITE=http://www.kaffe.org
ENTERED=20020321
diff --git a/java/kaffe/HISTORY b/java/kaffe/HISTORY
index c5ca0e4..25bb773 100644
--- a/java/kaffe/HISTORY
+++ b/java/kaffe/HISTORY
@@ -1,3 +1,7 @@
+2009-08-03 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 1.1.9
+ * DEPENDS: added more options
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/shell-term-fm/tcsh/DETAILS b/shell-term-fm/tcsh/DETAILS
index 85ece84..ed2d093 100755
--- a/shell-term-fm/tcsh/DETAILS
+++ b/shell-term-fm/tcsh/DETAILS
@@ -1,11 +1,10 @@
SPELL=tcsh
- VERSION=6.16
+ VERSION=6.17
SOURCE=$SPELL-$VERSION.00.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.00
SOURCE_URL[0]=ftp://ftp.astron.com/pub/tcsh/$SOURCE
SOURCE_URL[1]=ftp://ftp.gw.com/pub/unix/tcsh/$SOURCE
SOURCE_URL[2]=ftp://ftp.funet.fi/pub/unix/shells/tcsh/$SOURCE
-#
SOURCE_HASH=sha512:e31a7f0aa8a954edca6341f76cc1e4d57e85df3b2012282114d576cd7115afdad3acc38911f72611de0ddb5901be716ace8b923093b6bcd0ae0aa5060564a952
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=BSD
WEB_SITE=http://www.tcsh.org/Home
diff --git a/shell-term-fm/tcsh/tcsh-6.16.00.tar.gz.sig
b/shell-term-fm/tcsh/tcsh-6.16.00.tar.gz.sig
deleted file mode 100644
index 6083775..0000000
Binary files a/shell-term-fm/tcsh/tcsh-6.16.00.tar.gz.sig and /dev/null differ
diff --git a/shell-term-fm/tcsh/tcsh-6.17.00.tar.gz.sig
b/shell-term-fm/tcsh/tcsh-6.17.00.tar.gz.sig
new file mode 100644
index 0000000..0c93491
Binary files /dev/null and b/shell-term-fm/tcsh/tcsh-6.17.00.tar.gz.sig differ




Archive powered by MHonArc 2.6.24.

Top of Page