Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv883
Modified Files:
openoffice.org.info openoffice.org.patch
Log Message:
Updated dependencies to use Python 2.5, Java 5, Mozilla SeaMonkey; Use
StartupItemContext in osacompile, which conflicts with --build-as-nobody;
Removed dependency of boost; Patch to link Fink's Python (Again); Misc cleanup
Index: openoffice.org.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- openoffice.org.patch 2 May 2007 08:26:32 -0000 1.20
+++ openoffice.org.patch 3 May 2007 03:00:43 -0000 1.21
@@ -113,8 +113,10 @@
.ENDIF
.IF "$(COMNAME)"=="sunpro5"
---- checkdll.sh 2007-05-02 03:38:03.000000000 +0900
-+++ checkdll.sh.fink 2007-05-02 12:14:15.000000000 +0900
+### Avoid adding /sw/lib into DYLD_LIBRARY_PATH on checking libraries,
+### which confises "libjpeg" and "libJPEG" etc.
+--- solenv/bin/checkdll.sh.orig 2007-05-02 03:38:03.000000000 +0900
++++ solenv/bin/checkdll.sh 2007-05-02 12:14:15.000000000 +0900
@@ -45,15 +45,21 @@
checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll"
@@ -140,3 +142,95 @@
esac
shift
done
+
+### Force to link against /sw/lib/libpython.so
+--- config_office/configure.in.orig 2007-01-19 21:55:19.000000000 +0900
++++ config_office/configure.in 2007-05-03 09:32:33.000000000 +0900
+@@ -2937,11 +2937,7 @@
+ python_version=`$PYTHON -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('VERSION');"`
+ PYTHON_CFLAGS="-I$python_include"
+
+- if test "$_os" = "Darwin"; then
+- PYTHON_LIBS="-framework Python"
+- else
+- PYTHON_LIBS="-lpython$python_version"
+- fi
++ PYTHON_LIBS=`python2.5-config --ldflags`
+
+ dnl check if the headers really work:
+ save_CPPFLAGS="$CPPFLAGS"
+
+--- config_office/configure.orig 2007-01-19 22:01:19.000000000 +0900
++++ config_office/configure 2007-05-03 09:31:06.000000000 +0900
+@@ -11561,11 +11561,7 @@
+ python_version=`$PYTHON -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('VERSION');"`
+ PYTHON_CFLAGS="-I$python_include"
+
+- if test "$_os" = "Darwin"; then
+- PYTHON_LIBS="-framework Python"
+- else
+- PYTHON_LIBS="-lpython$python_version"
+- fi
++ PYTHON_LIBS=`python2.5-config --ldflags`
+
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
+
+### link mozilla bits to seamonkey; IZ 73440
+--- config_office/configure.in.orig 2007-01-13 14:18:26.000000000 +0100
++++ config_office/configure.in 2007-01-13 14:20:11.000000000 +0100
+@@ -58,6 +58,10 @@
+ [ --with-firefox Use Firefox instead of Mozilla Suite for building.
+ Only honoured with --with-system-mozilla
+ ],,)
++AC_ARG_WITH(seamonkey,
++[ --with-seamonkey Use Seamonkey instead of Mozilla Suite for
building.
++ Only honoured with --with-system-mozilla
++],,)
+ AC_ARG_WITH(xulrunner,
+ [ --with-xulrunner Use XULRunner instead of Mozilla Suite for
building.
+ Only honoured with --with-system-mozilla
+@@ -3714,6 +3718,8 @@
+ AC_MSG_CHECKING([which Mozilla flavour to use])
+ if test -n "$with_firefox" && test "$with_firefox" != "no"; then
+ MOZ_FLAVOUR=firefox
++ elif test -n "$with_seamonkey" && test "$with_seamonkey" != "no"; then
++ MOZ_FLAVOUR=seamonkey
+ elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then
+ MOZ_FLAVOUR=xulrunner
+ else
+
+--- config_office/configure.orig 2007-01-19 22:01:19.000000000 +0900
++++ config_office/configure 2007-05-03 11:33:06.000000000 +0900
+@@ -1029,6 +1029,9 @@
+ --with-firefox Use Firefox instead of Mozilla Suite for building.
+ Only honoured with --with-system-mozilla
+
++ --with-seamonkey Use Seamonkey instead of Mozilla Suite for building.
++ Only honoured with --with-system-mozilla
++
+ --with-xulrunner Use XULRunner instead of Mozilla Suite for building.
+ Only honoured with --with-system-mozilla
+
+@@ -1843,6 +1846,12 @@
+
+ fi;
+
++# Check whether --with-seamonkey or --without-seamonkey was given.
++if test "${with_seamonkey+set}" = set; then
++ withval="$with_seamonkey"
++
++fi;
++
+ # Check whether --with-xulrunner or --without-xulrunner was given.
+ if test "${with_xulrunner+set}" = set; then
+ withval="$with_xulrunner"
+@@ -13577,6 +13586,8 @@
+ echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6
+ if test -n "$with_firefox" && test "$with_firefox" != "no"; then
+ MOZ_FLAVOUR=firefox
++ elif test -n "$with_seamonkey" && test "$with_seamonkey" != "no"; then
++ MOZ_FLAVOUR=seamonkey
+ elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then
+ MOZ_FLAVOUR=xulrunner
+ else
Index: openoffice.org.info
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.info,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- openoffice.org.info 2 May 2007 08:26:31 -0000 1.38
+++ openoffice.org.info 3 May 2007 03:00:43 -0000 1.39
@@ -2,7 +2,7 @@
Description: Integrated office productivity suite
Version: 2.2.0m15
Revision: 1001
-Type: java(1.4)
+Type: java(1.5)
License: LGPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -11,7 +11,7 @@
Provides: openoffice.org-generation2
BuildConflicts: libicu32-dev
BuildDepends: <<
- x11-dev, ant, bison, coreutils, system-java14-dev,
+ x11-dev, ant, bison, coreutils, system-java15-dev,
archive-zip-pm586,
libjpeg, expat, freetype219, libxml2,
sane-backends-dev, libcurl3-unified, libsndfile1-dev,
@@ -23,13 +23,12 @@
db42-ssl (>= 4.2.52-1017) | db42 (>= 4.2.52-1017),
libsablot-dev (>= 0.98-1024), libsablot (>= 0.98-1024),
unixodbc2-nox (>= 2.2.11-1010) | unixodbc2 (>= 2.2.11-1010),
- mozilla-dev (>= 1.7.5-1102),
- boost1.32-py24 (>= 1.32.0-1002), python24 (>= 1:2.4.2-1004),
- pkgconfig, popt, autoconf2.5, fink (>= 0.24.12)
+ seamonkey-dev, python25 (>= 1:2.4.2-1004),
+ pkgconfig, popt, fink (>= 0.24.12)
<<
Depends: <<
- x11, system-java14, system-perl,
+ x11, system-java15, system-perl,
libjpeg-shlibs, expat-shlibs, freetype219-shlibs, libxml2-shlibs,
sane-backends-shlibs, libcurl3-unified-shlibs, libsndfile1-shlibs,
portaudio-shlibs (>= 18.1-1), neon24-ssl-shlibs | neon24-shlibs,
@@ -41,8 +40,7 @@
db42-ssl-java (>= 4.2.52-1012) | db42-java (>= 4.2.52-1012),
libsablot-shlibs (>= 0.98-1024),
unixodbc2-nox-shlibs (>= 2.2.11-1010) | unixodbc2-shlibs (>= 2.2.11-1010),
- mozilla-shlibs (>= 1.7.5-1102), mozilla-mailnews (>= 1.7.5-1102),
- python24-shlibs (>= 1:2.4.2-1004),
+ seamonkey-shlibs, python25-shlibs,
fondu
<<
@@ -172,23 +170,25 @@
SourceDirectory: OOF680_m15
PatchFile: %n.patch
-PatchFile-MD5: 378e343f9fb366d233a06863da7770d1
+PatchFile-MD5: 4af7292d3ec668a7186d9df94036f7f3
PatchScript: <<
#!/bin/bash -ev
/usr/bin/patch -p0 < %{PatchFile}
chmod a+x languagepack-splitoff
/bin/mv ../unowinreg.dll ./external/unowinreg/
- if ! osacompile -o test desktop/macosx/source/main.applescript >/dev/null
2>&1; then
- if ! /usr/libexec/StartupItemContext /usr/bin/osacompile -o test
desktop/macosx/source/main.applescript >/dev/null 2>&1; then
- echo "osacompile failed. this is typically for you don't have
StartupItemContext."
- false
- fi
+ if osacompile -o test desktop/macosx/source/main.applescript >/dev/null
2>&1; then
+ :
+ elif /usr/libexec/StartupItemContext /usr/bin/osacompile -o test
desktop/macosx/source/main.applescript >/dev/null 2>&1; then
+ /usr/bin/sed -i.bak "s|osacomiple|/usr/libexec/StartupItemContext
/usr/bin/osacompile|g" desktop/macosx/source/makefile.mk
+ else
+ echo "osacompile failed. This is typically for you don't have root access."
+ false
fi
<<
GCC: 4.0
-SetCPPFLAGS: -I%p/include/db4 -I%p/include/boost
+SetCPPFLAGS: -I%p/include/db4
ConfigureParams: <<
--with-gnu-cp=%p/lib/coreutils/bin/cp \
--disable-epm \
@@ -215,14 +215,15 @@
--with-system-jpeg \
--with-system-expat \
--enable-gtk \
+ --disable-systray \
--disable-kde \
--with-system-freetype \
- --with-system-boost \
--without-nas \
--with-system-libxml \
--with-system-python \
--with-python-libs="-L%p/lib/python2.4/config -lpython2.4" \
--with-system-mozilla \
+ --with-seamonkey \
--enable-openldap \
--enable-libsn
<<
@@ -230,50 +231,45 @@
CompileScript: <<
#!/bin/bash -ev
-
if ${CXX:-"g++"} --version | /usr/bin/grep -q 'build 5250'; then
echo "Xcode 2.2.1 is buggy." >&2
exit 2
fi
- echo "[ Message from OpenOffice.org package maintainer ] ================="
- echo
- echo "Welcome to OpenOffice.org build script!"
- echo
- echo "Notice for builders:"
- echo
- echo "1. This building process may take a couple of day or more,"
- echo " and often fails with errors."
- echo "2. This building process may consume much of your disk space,"
- echo " possibly up to 10GB."
- echo "3. This building process needs your own WindowServer process."
- echo " i.e, it is not possible to build through simple SSH connection."
- echo " This is because the building process uses /usr/bin/osacompile ."
- echo " (This limitation would be removed in the future release.)"
- echo
- echo "If you faced a building problem, feel free to mail the maintainer,"
- echo "preferably with your environment (gcc's version, etc.) and"
- echo "the build log."
- echo "You can find the logs here:"
- echo " %b/%n-%v-%r.buildlog"
- echo
- echo "The mail address is: Todai Fink Team <[EMAIL PROTECTED]>"
- echo
- echo "Please understand this Fink package is still unstable."
- echo
- echo "===================================================================="
- echo
- echo "If you are ready, press RETURN/ENTER to proceed..."
+: "[ Message from OpenOffice.org package maintainer ] ================="
+:
+: "Welcome to OpenOffice.org build script!"
+:
+: "Notice for builders:"
+:
+: "1. This building process may take a couple of day or more,"
+: " and often fails with errors."
+: "2. This building process may consume much of your disk space,"
+: " possibly up to 10GB."
+: "3. This building process needs your own WindowServer process."
+: " i.e, it is not possible to build through simple SSH connection."
+: " This is because the building process uses /usr/bin/osacompile ."
+: " (This limitation would be removed in the future release.)"
+:
+: "If you faced a building problem, feel free to mail the maintainer,"
+: "preferably with your environment (gcc's version, etc.) and"
+: "the build log."
+: "You can find the logs here:"
+: " %b/%n-%v-%r.buildlog"
+:
+: "The mail address is: Todai Fink Team <[EMAIL PROTECTED]>"
+:
+: "Please understand this Fink package is still unstable."
+:
+: "===================================================================="
+:
+: "If you are ready, press RETURN/ENTER to proceed..."
read -t 60 || true
- echo
-
# Record the time
STARTTIME=`/bin/date +"%%F %%T %%Z(%%z)"`
- set -v
-
# Check the architecture
case %m in
powerpc) machine=PPC;;
@@ -290,10 +286,6 @@
# $PKG_CONFIG_PATH is needed to configure with freetype219
export PKG_CONFIG_PATH=%p/lib/freetype219/lib/pkgconfig
- # $PYTHON is needed to configure with python24
- export PYTHON=%p/bin/python2.4
-
-
/usr/bin/printf "[ Phase 1: Configure ]\n\n" >&3
(cd config_office && ./configure %c) >&3 2>&3 || exit
@@ -318,19 +310,19 @@
. ./MacOSX${machine}Env.Set.sh
dmake >&3 2>&3 && break
- echo
- echo "[ Message from OpenOffice.org package maintainer ] ================="
- echo
- echo "Building OpenOffice.org faild with an error."
- echo "Now you can get rid of the cause by hand, or call for help."
- echo "The build directory is:"
- echo " %b"
- echo "and the full log file is available here:"
- echo " %b/%n-%v-%r.buildlog"
- echo
- echo "===================================================================="
- echo
- echo "Press RETURN/ENTER to exit or input any key to restart dmake..."
+: "[ Message from OpenOffice.org package maintainer ] ================="
+:
+: "Building OpenOffice.org faild with an error."
+: "Now you can get rid of the cause by hand, or call for help."
+: "The build directory is:"
+: " %b"
+: "and the full log file is available here:"
+: " %b/%n-%v-%r.buildlog"
+:
+: "===================================================================="
+:
+: "Press RETURN/ENTER to exit or input any key to restart dmake..."
+
read input
[ -n "$input" ] || false
done
@@ -338,11 +330,14 @@
set +v
/usr/bin/printf "\n\n[ Phase 4: Statistics ]\n\n" >&3
- echo
- echo "[ Message from OpenOffice.org package maintainer ] ================="
- echo
- echo "Congratulations!"
- echo "The building process of OpenOffice.org has completed!"
+
+: "[ Message from OpenOffice.org package maintainer ] ================="
+:
+: "Congratulations!"
+: "The building process of OpenOffice.org has completed!"
+:
+: "===================================================================="
+
echo " Started: $STARTTIME" >&3
ENDTIME=`/bin/date +"%%F %%T %%Z(%%z)"`
@@ -352,8 +347,6 @@
DISKUSAGE=`/usr/bin/du -sh %b | /usr/bin/cut -f1`
echo " $DISKUSAGE is used for this building process (not including
tarball)." >&3
- echo
- echo "===================================================================="
<<
InstallScript: <<
@@ -450,7 +443,7 @@
# End of Install Phase. Proceeding to install language packs...
<<
-#AppBundles:
instsetoo_native/unxmacxp.pro/OpenOffice/install/en-US_temp/OpenOffice.org*.app
+
PostInstScript: <<
%p/sbin/update-ooo-fonts
[ ! -e /Applications/Fink ] && /usr/bin/install -d -m 755 /Applications/Fink
@@ -495,12 +488,6 @@
DescPackaging: <<
This finkinfo is maintained by m4. See
experimental/asari/openoffice.org.info.m4.
-To Do 1: Report build failures on building nas (Network Audio System)
- ( --without-nas or --with-system-nas )
-with internal nas, build fails on Panther.
-
-"boost" is required on compile time, but not needed on runtime.
-
These --with-system flags are not used because they are not in Fink:
--with-system-mspack
--with-system-myspell
@@ -508,8 +495,6 @@
--with-system-altlinuxhyph
--enable-evolution2
-Some comments about configure logs:
-# checking whether to enable fontconfig support... no
Using fontconfig is not supported on Mac OS X.
<<
DescUsage: <<
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
