Update of /cvsroot/fink/experimental/asari In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13592
Modified Files: openoffice.org.patch openoffice.org.info Log Message: Revert --with-python-libs configure option Index: openoffice.org.patch =================================================================== RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- openoffice.org.patch 4 May 2007 23:18:41 -0000 1.27 +++ openoffice.org.patch 6 May 2007 20:52:56 -0000 1.28 @@ -45,9 +45,10 @@ + +/usr/bin/install -m 755 -d $fink_i/share/doc/$fink_N-$lang1 +/bin/mv $fink_i/Applications/{LICENSEs,READMEs} $fink_i/share/doc/$fink_N-$lang1 + ### Script to convert Mac OS X fonts to truetype fonts --- /dev/null Tue Feb 7 11:38:20 2006 -+++ update-ooo-fonts.in Tue Feb 7 11:37:47 2006 ++++ update-ooo-fonts Tue Feb 7 11:37:47 2006 @@ -0,0 +1,52 @@ +#!/bin/sh +set -e @@ -101,6 +102,8 @@ + /bin/ln -sf "../fondu/$font" "truetype/$font" +done < fondu/fondu-ttf.tmp +/usr/bin/touch truetype/.fondudone + +### Avoid random failure on compiling Python on Panther ### No-op if --with-system-python --- python/makefile.mk 2005-12-29 01:57:47.000000000 +0900 +++ python/makefile.mk.fink 2006-01-15 20:59:52.000000000 +0900 @@ -146,10 +149,27 @@ 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 @@ +### Add configure option to link against Fink's Python +--- configure.in.orig 2007-05-07 05:09:11.000000000 +0900 ++++ configure.in 2007-05-07 05:08:30.000000000 +0900 +@@ -286,6 +286,16 @@ + AC_ARG_WITH(system-python, + [ --with-system-python Use python already on system + ],,) ++AC_ARG_WITH(python-libs, ++[[ --with-python-libs[=auto|LIBS|none] ++ Specify linker options to link the python library. [default=auto] ++ This option does nothing without --with-system-python. ++]],[ ++case $withval in ++ yes) with_python_libs=auto;; ++ no|"") with_python_libs=none;; ++esac ++],with_python_libs=auto) + AC_ARG_WITH(system-icu, + [ --with-system-icu Use icu already on system + ],,) +@@ -2937,11 +2947,16 @@ python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"` PYTHON_CFLAGS="-I$python_include" @@ -158,14 +178,54 @@ - else - PYTHON_LIBS="-lpython$python_version" - fi -+ PYTHON_LIBS=`python2.5-config --ldflags` ++ case $with_python_libs in ++ auto) ++ case $_os:$python_include in ++ Darwin:/System/*) PYTHON_LIBS="-framework Python" ;; ++ *) PYTHON_LIBS="-lpython$python_version" ;; ++ esac ++ ;; ++ none) PYTHON_LIBS= ;; ++ *) PYTHON_LIBS=$with_python_libs ;; ++ esac 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 @@ +--- configure.orig 2007-05-07 05:09:20.000000000 +0900 ++++ configure 2007-05-07 05:11:31.000000000 +0900 +@@ -1733,6 +1733,10 @@ + + --with-system-python Use python already on system + ++ --with-python-libs[=auto|LIBS|none] ++ Specify linker options to link the python library. [default=auto] ++ This option does nothing without --with-system-python. ++ + --with-system-icu Use icu already on system + + --with-system-db Use berkeley db already on system +@@ -2788,6 +2792,19 @@ + fi + + ++# Check whether --with-python-libs was given. ++if test "${with_python_libs+set}" = set; then ++ withval=$with_python_libs; ++case $withval in ++ yes) with_python_libs=auto;; ++ no|"") with_python_libs=none;; ++esac ++ ++else ++ with_python_libs=auto ++fi ++ ++ + # Check whether --with-system-icu was given. + if test "${with_system_icu+set}" = set; then + withval=$with_system_icu; +@@ -13061,11 +13078,16 @@ python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"` PYTHON_CFLAGS="-I$python_include" @@ -174,7 +234,16 @@ - else - PYTHON_LIBS="-lpython$python_version" - fi -+ PYTHON_LIBS=`python2.5-config --ldflags` ++ case $with_python_libs in ++ auto) ++ case $_os:$python_include in ++ Darwin:/System/*) PYTHON_LIBS="-framework Python" ;; ++ *) PYTHON_LIBS="-lpython$python_version" ;; ++ esac ++ ;; ++ none) PYTHON_LIBS= ;; ++ *) PYTHON_LIBS=$with_python_libs ;; ++ esac save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" Index: openoffice.org.info =================================================================== RCS file: /cvsroot/fink/experimental/asari/openoffice.org.info,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- openoffice.org.info 4 May 2007 23:18:41 -0000 1.49 +++ openoffice.org.info 6 May 2007 20:52:56 -0000 1.50 @@ -23,7 +23,7 @@ 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), - seamonkey-dev, python25 (>= 1:2.4.2-1004), + seamonkey-dev, python25, pkgconfig, popt, fink (>= 0.24.12) << @@ -170,17 +170,17 @@ SourceDirectory: OOF680_m15 PatchFile: %n.patch -PatchFile-MD5: 15ab16df8f376dc7d13da0f6297f17a0 +PatchFile-MD5: ad374fb2df0ca5d05cd205c02518ba4b PatchScript: << #!/bin/bash -ev - /usr/bin/patch -p0 < %{PatchFile} + /usr/bin/sed 's|@PREFIX@|%p|g;s|@PKGNAME@|%n|g' %{PatchFile} | /usr/bin/patch -p0 chmod a+x languagepack-splitoff - /bin/mv ../unowinreg.dll ./external/unowinreg/ + /bin/ln ../unowinreg.dll ./external/unowinreg/ - if osacompile -o test desktop/macosx/source/main.applescript >/dev/null 2>&1; then + 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|osacompile|/usr/libexec/StartupItemContext /usr/bin/osacompile|g" desktop/macosx/source/makefile.mk + 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|osacompile|/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 @@ -221,10 +221,9 @@ --without-nas \ --with-system-libxml \ --with-system-python \ - --with-python-libs="-L%p/lib/python2.4/config -lpython2.4" \ + --with-python-libs="$(%p/bin/python2.5-config --ldflags)" \ --with-system-mozilla \ --with-seamonkey \ - --enable-openldap \ --enable-libsn << @@ -249,7 +248,7 @@ : "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.)" +: " /usr/libexec/StartupItemContext will be used if you are root." : : "If you faced a building problem, feel free to mail the maintainer," : "preferably with your environment (gcc's version, etc.) and" @@ -303,7 +302,6 @@ /bin/mkdir FINKLIBS /bin/ln -s %p/lib/libdb_java-4.2.jnilib FINKLIBS - /bin/ln -s %p/lib/libiconv.2.dylib FINKLIBS # Retry forever to build OOo until success! while :; do @@ -415,14 +413,13 @@ # Install update-ooo-fonts /usr/bin/install -m 755 -d %i/sbin - sed 's|@PREFIX@|%p|g;s|@PKGNAME@|%n|g' update-ooo-fonts.in > %i/sbin/update-ooo-fonts - /bin/chmod 755 %i/sbin/update-ooo-fonts + /usr/bin/install -m 755 update-ooo-fonts %i/sbin/update-ooo-fonts # Install DocFiles /usr/bin/install -m 755 -d %i/share/doc/%n /bin/mv %i/Applications/{LICENSEs,READMEs} %i/share/doc/%n - # Currently, Fink cannot handle "OpenOffice.org 2.0.app" + # Currently, Fink cannot handle "OpenOffice.org 2.2.app" # (which contains space character) with AppBundles field. [ -x /Developer/Tools/SplitForks ] && /Developer/Tools/SplitForks '%i/Applications/' @@ -462,7 +459,7 @@ and ssa @ irc://irc.freenode.net/OpenOffice.org . Thanks to all OOo persons! You can join discussions on porting here: -http://porting.openoffice.org/servlets/SummarizeList?listName=dev +http://porting.openoffice.org/servlets/SummarizeList?listName=mac It is reported that: * Mac OS X SDK (which comes with Xcode) is needed. @@ -485,7 +482,7 @@ << DescUsage: << To start OpenOffice.org, type "soffice" on your terminal, -or double-click "OpenOffice.org 2.0.app" icon located at /Applications/Fink . +or double-click "OpenOffice.org 2.2.app" icon located at /Applications/Fink . To use GTK+ look and feel, set SAL_USE_VCLPLUGIN environmental variable to "gtk". ------------------------------------------------------------------------- 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