Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11257
Modified Files:
openoffice.org.info openoffice.org.patch
Log Message:
Version bumped. Now OOo build needs autoconf
Index: openoffice.org.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- openoffice.org.patch 14 Aug 2005 10:07:59 -0000 1.8
+++ openoffice.org.patch 15 Aug 2005 09:07:13 -0000 1.9
@@ -1,90 +1,4 @@
-diff -ur package/inc/ZipPackageFolder.hxx package_new/inc/ZipPackageFolder.hxx
---- package/inc/ZipPackageFolder.hxx 2005-07-12 14:28:10.000000000 +0200
-+++ package_new/inc/ZipPackageFolder.hxx 2005-07-14 17:30:52.000000000
+0200
-@@ -121,7 +121,7 @@
- }
-
- void setPackageFormat_Impl( sal_Bool bPackageFormat ) {
m_bPackageFormat = bPackageFormat; }
-- void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) {
ZipPackageEntry::mbAllowRemoveOnInsert = bRemove; }
-+ void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) {
this->mbAllowRemoveOnInsert = bRemove; }
-
- // Recursive functions
- void saveContents(rtl::OUString &rPath, std::vector <
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > >
&rManList, ZipOutputStream & rZipOut, com::sun::star::uno::Sequence < sal_Int8
> &rEncryptionKey, rtlRandomPool & rRandomPool)
-diff -ur package/source/zippackage/ZipPackageFolder.cxx
package_new/source/zippackage/ZipPackageFolder.cxx
---- package/source/zippackage/ZipPackageFolder.cxx 2005-07-12
14:31:33.000000000 +0200
-+++ package_new/source/zippackage/ZipPackageFolder.cxx 2005-07-14
17:31:14.000000000 +0200
-@@ -128,7 +128,7 @@
- {
- OSL_ENSURE( m_xFactory.is(), "No factory is provided to the package
folder!" );
-
-- ZipPackageEntry::mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
-+ this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
-
- SetFolder ( sal_True );
- aEntry.nVersion = -1;
-diff -ur package/source/zippackage/ZipPackageStream.cxx
package_new/source/zippackage/ZipPackageStream.cxx
---- package/source/zippackage/ZipPackageStream.cxx 2005-07-12
14:31:48.000000000 +0200
-+++ package_new/source/zippackage/ZipPackageStream.cxx 2005-07-14
17:32:10.000000000 +0200
-@@ -137,7 +137,7 @@
- {
- OSL_ENSURE( m_xFactory.is(), "No factory is provided to
ZipPackageStream!\n" );
-
-- ZipPackageEntry::mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
-+ this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
-
- SetFolder ( sal_False );
- aEntry.nVersion = -1;
---- config_office/configure 2005-08-04 00:25:19.000000000 +0900
-+++ config_office/configure.fink 2005-08-04 09:22:19.000000000 +0900
-@@ -8099,7 +8099,7 @@
- ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS [EMAIL
PROTECTED]@/lib conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- fi
-@@ -9954,7 +9954,8 @@
- python_include=`$PYTHON -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('INCLUDEPY');"`
- python_version=`$PYTHON -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('VERSION');"`
- PYTHON_CFLAGS="-I$python_include"
-- PYTHON_LIBS="-lpython$python_version"
-+ PYTHON_LIBS=`$PYTHON -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('LIBPL');"`
-+ PYTHON_LIBS="-L$PYTHON_LIBS -lpython$python_version"
-
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-@@ -13954,7 +13955,7 @@
- { (exit 1); exit 1; }; } # Exit
- fi
- CFLAGS=$X_CFLAGS
-- LDFLAGS="$X_LDFLAGS $X_LIBS"
-+ LDFLAGS="[EMAIL PROTECTED]@/lib $X_LDFLAGS $X_LIBS"
- echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
- echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
- if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
-@@ -15106,7 +15107,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lportaudio $LIBS"
-+LIBS="-framework CoreAudio -framework AudioToolBox -lportaudio $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15169,7 +15170,7 @@
- #define HAVE_LIBPORTAUDIO 1
- _ACEOF
-
-- LIBS="-lportaudio $LIBS"
-+ LIBS="-framework CoreAudio -framework AudioToolBox -lportaudio $LIBS"
-
- else
- { { echo "$as_me:$LINENO: error: portaudio library not found or functional"
>&5
-
-
-
+### scp2 patches to use correct libxml
Index: scp2/source/base/file_base.scp
===================================================================
RCS file: /cvs/installation/scp2/source/base/file_base.scp,v
@@ -179,7 +93,7 @@
+
-
+### ucb patches to use system neon installed in non-standard directory
Index: ucb/source/ucp/webdav/LinkSequence.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/LinkSequence.cxx,v
@@ -379,46 +293,56 @@
NEONINCDIR=external$/neon
-
+### patch to use system jpeg
Index: solenv/inc/libs.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/libs.mk,v
-retrieving revision 1.91
-diff -u -r1.91 libs.mk
---- solenv/inc/libs.mk 20 Jun 2005 15:27:27 -0000 1.91
-+++ solenv/inc/libs.mk 14 Aug 2005 09:43:22 -0000
-@@ -2,9 +2,9 @@
- #
- # $RCSfile$
- #
--# $Revision$
-+# $Revision$
- #
--# last change: $Author$ $Date$
-+# last change: $Author$ $Date$
- #
- # The Contents of this file are made available subject to the terms of
- # either of the following licenses
-@@ -59,7 +59,7 @@
- #
- #
- #*************************************************************************
--LIBSMKREV!:="$$Revision$$"
-+LIBSMKREV!:="$$Revision$$"
-
- .IF "$(COM)"=="WTC"
- LIBPRE=libr
-@@ -206,7 +206,13 @@
- .IF "$(SYSTEM_JPEG)"=="YES"
- .IF "$(SOLAR_JAVA)" != ""
+retrieving revision 1.92
+diff -u -u -r1.92 libs.mk
+--- solenv/inc/libs.mk 5 Aug 2005 15:04:49 -0000 1.92
++++ solenv/inc/libs.mk 15 Aug 2005 06:21:39 -0000
+@@ -208,6 +208,8 @@
#i34482# Blackdown jdk is in the libsearch patch and has a libjpeg
-+.IF "$(OS)" == "FREEBSD"
-+JPEG3RDLIB=/usr/local/lib/libjpeg.so
+ .IF "$(OS)" == "FREEBSD"
+ JPEG3RDLIB=/usr/local/lib/libjpeg.so
+.ELIF "$(OS)" == "MACOSX"
+JPEG3RDLIB=-ljpeg
-+.ELSE
- JPEG3RDLIB=/usr/lib/libjpeg.so
-+.ENDIF
.ELSE
- JPEG3RDLIB=-ljpeg
+ JPEG3RDLIB=/usr/lib/libjpeg.so
.ENDIF
+
+
+# patch to use system python and system portaudio
+Index: config_office/configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.129
+diff -u -r1.129 configure.in
+--- config_office/configure.in 5 Aug 2005 15:05:56 -0000 1.129
++++ config_office/configure.in 15 Aug 2005 08:14:48 -0000
+@@ -2436,7 +2436,8 @@
+ python_include=`$PYTHON -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('INCLUDEPY');"`
+ python_version=`$PYTHON -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('VERSION');"`
+ PYTHON_CFLAGS="-I$python_include"
+- PYTHON_LIBS="-lpython$python_version"
++ PYTHON_LIBS=`$PYTHON -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('LIBPL');"`
++ PYTHON_LIBS="-L$PYTHON_LIBS -lpython$python_version"
+
+ dnl check if the headers really work:
+ save_CPPFLAGS="$CPPFLAGS"
+@@ -3047,8 +3048,13 @@
+ AC_MSG_RESULT(external)
+ AC_CHECK_HEADER(portaudio.h, [],
+ [AC_MSG_ERROR(portaudio header not found. install portaudio)],
[])
+- AC_CHECK_LIB(portaudio, Pa_Initialize, [],
+- [AC_MSG_ERROR(portaudio library not found or functional)], [])
++ if test "$_os" = "Darwin"; then
++ AC_CHECK_LIB(portaudio, Pa_Initialize, [],
++ [AC_MSG_ERROR(portaudio library not found or functional)],
[-framework CoreAudio -framework AudioToolBox])
++ else
++ AC_CHECK_LIB(portaudio, Pa_Initialize, [],
++ [AC_MSG_ERROR(portaudio library not found or functional)],
[])
++ fi
+ AC_MSG_CHECKING(portaudio version)
+ AC_LANG(C)
+ AC_TRY_LINK([#include <portaudio.h>], [
Index: openoffice.org.info
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- openoffice.org.info 14 Aug 2005 10:07:59 -0000 1.11
+++ openoffice.org.info 15 Aug 2005 09:07:13 -0000 1.12
@@ -1,8 +1,8 @@
Info2: <<
Package: openoffice.org
Description: Integrated office productivity suite
-Version: 1.9m121
-Revision: 63
+Version: 1.9m123
+Revision: 11
License: OSI-Approved
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -15,7 +15,8 @@
sane-backends, libcurl3-ssl | libcurl3,
boost1.32-py23 | boost1.32-py24, libsndfile1-dev,
portaudio, neon24-ssl | neon24,
- mozilla-dev
+ mozilla-dev,
+ autoconf2.5
<<
Depends: <<
x11, system-java14, system-perl,
@@ -34,12 +35,12 @@
NoSourceDirectory: true
Source2: ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z
Source2-MD5: fdb06fdb5a4670b172f9fb738b717be9
-Source3:
http://fink.sodan.ecc.u-tokyo.ac.jp/~asari/OpenOffice.org/patches/openoffice.org.113to121.patch.bz2
-Source3-MD5: e7711d8ed979eaab1cc62d1866b39115
+Source3:
http://fink.sodan.ecc.u-tokyo.ac.jp/~asari/OpenOffice.org/patches/openoffice.org.113to123.patch.bz2
+Source3-MD5: 8c0edf9234b3b96b0a32df596c2122e4
PatchScript: <<
/bin/mv gpc231/gpc.{c,h} external/gpc
- /usr/bin/bzip2 -dc openoffice.org.113to121.patch.bz2 | /usr/bin/patch -p1
+ /usr/bin/bzip2 -dc openoffice.org.113to123.patch.bz2 | /usr/bin/patch -p1
/usr/bin/sed "s|@FINK_PREFIX@|%p|g" < %a/%n.patch | /usr/bin/patch -p0
/bin/mkdir FINKLIBS
/bin/ln -s %p/lib/libdb_java-4.2.jnilib FINKLIBS
@@ -54,6 +55,7 @@
--with-x --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
--with-jdk-home=/Library/Java/Home --with-ant-home=%p/lib/ant \
--disable-gtk --disable-crashdump \
+ --enable-pasf \
--with-build-version="%v-%r; Built with Fink <http://fink.sourceforge.net>" \
--with-system-stdlibs \
--with-system-zlib \
@@ -79,18 +81,21 @@
# --with-system-myspell # not in Fink
# --with-system-mythes # not in Fink
# --with-system-altlinuxhyph # not in Fink
-# --with-system-boost # error ocurres?
-# --with-system-python # fails building instsetooo_native?
+# --with-system-boost # TO DO 2 : error ocurres?
+# --with-system-python # TO DO 3 : fails building instsetooo_native?
+# link to system freetype # TO DO 1
+# --enable-libart # TO DO 0
GCC: 3.3
CompileScript: <<
#!/bin/bash -ev
- (cd config_office && PKG_CONFIG_PATH=%p/lib/freetype219/lib/pkgconfig/
./configure %c)
+ export X_LDFLAGS=$LDFLAGS
+ export PKG_CONFIG_PATH=%p/lib/freetype219/lib/pkgconfig
+ (cd config_office && autoconf && ./configure %c)
./bootstrap
. MacosxEnv.Set.sh
export SOLARINC=`echo $SOLARINC | /usr/bin/sed -e"s|-I/usr/X11R6/include
-I/usr/X11R6/include/freetype2|-I%p/include/db4 -I%p/include
-I%p/lib/freetype219/include/freetype2 -I/sw/lib/freetype219/include
-I/usr/X1186/include|g"`
export SOLARLIB=`echo $SOLARLIB | /usr/bin/sed -e"s|-L/usr/lib|-L%p/lib
-L/usr/lib|g"`
- export SYSTEM_PORTAUDIO=YES
export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:%b/FINKLIBS"
export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
dmake
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
