SOURCES: openoffice.org-firefox.diff (NEW), openoffice.org-mdbtool...
sls
sls at pld-linux.org
Tue Oct 24 23:41:12 CEST 2006
Author: sls Date: Tue Oct 24 21:41:11 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- added patches allowing build with openoffice-2.0.4-m4:
- portaudio_v19 allows using portaudio-19 (default portaudio-18)
- mdbtools_fix add missing -I/usr/include/mdb to CFLAGS
- nolfs_hack turns off lfs-support, but allows comile xml2cmp (without this
we've got unresolved symbols and segfault)
- firefox - in PLD there are mozilla-{nspr,nss}.pc, not firefox*.pc
- regcomp_ugly_hack - very ugly workarund to regcomp.bin crash in install
section;
- stl5_fix fixes building with slt5
---- Files affected:
SOURCES:
openoffice.org-firefox.diff (NONE -> 1.1) (NEW), openoffice.org-mdbtools_fix.diff (NONE -> 1.1) (NEW), openoffice.org-nolfs_hack.patch (NONE -> 1.1) (NEW), openoffice.org-portaudio_v19.diff (NONE -> 1.1) (NEW), openoffice.org-regcomp_ugly_hack.diff (NONE -> 1.1) (NEW), openoffice.org-stl5_fix.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/openoffice.org-firefox.diff
diff -u /dev/null SOURCES/openoffice.org-firefox.diff:1.1
--- /dev/null Tue Oct 24 23:41:11 2006
+++ SOURCES/openoffice.org-firefox.diff Tue Oct 24 23:41:06 2006
@@ -0,0 +1,17 @@
+--- config_office/configure.in.orig 2006-10-22 16:26:15.161119500 +0200
++++ config_office/configure.in 2006-10-22 16:27:57.079489000 +0200
+@@ -3639,12 +3639,12 @@
+ NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
+ AC_SUBST(NSPR_LIB)
+ else
+- PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
++ PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr )
+ fi
+
+ PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
+ if test -z "$STANDALONENSS"; then
+- PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
++ PKG_CHECK_MODULES( MOZ_NSS, mozilla-nss )
+ else
+ NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
+ AC_SUBST(NSS_LIB)
================================================================
Index: SOURCES/openoffice.org-mdbtools_fix.diff
diff -u /dev/null SOURCES/openoffice.org-mdbtools_fix.diff:1.1
--- /dev/null Tue Oct 24 23:41:11 2006
+++ SOURCES/openoffice.org-mdbtools_fix.diff Tue Oct 24 23:41:06 2006
@@ -0,0 +1,13 @@
+--- config_office/configure.in.orig 2006-08-17 08:31:43.000000000 +0000
++++ config_office/configure.in 2006-08-17 08:32:47.000000000 +0000
+@@ -3208,7 +3208,9 @@
+ PKG_CHECK_MODULES(GLIB, glib-2.0)
+ AM_ICONV
+ if test "$am_cv_func_iconv" = "yes"; then
+- MDBTOOLS_CFLAGS=-DHAVE_ICONV
++ MDBTOOLS_CFLAGS="-DHAVE_ICONV -I/usr/include/mdb/"
++ else
++ MDBTOOLS_CFLAGS=-I/usr/include/mdb/
+ fi
+ dnl save_CFLAGS=$CFLAGS
+ dnl CFLAGS="$GLIB_CFLAGS -I. $MDBTOOLS_CFLAGS"
================================================================
Index: SOURCES/openoffice.org-nolfs_hack.patch
diff -u /dev/null SOURCES/openoffice.org-nolfs_hack.patch:1.1
--- /dev/null Tue Oct 24 23:41:11 2006
+++ SOURCES/openoffice.org-nolfs_hack.patch Tue Oct 24 23:41:06 2006
@@ -0,0 +1,12 @@
+--- ooo-build-ood680-m4/patches/src680/apply.orig 2006-10-14 18:58:18.847040750 +0000
++++ ooo-build-ood680-m4/patches/src680/apply 2006-10-14 18:58:36.612151000 +0000
+@@ -760,9 +760,6 @@
+ # Use short TMP and TEMP if possible in Win32 build
+ win32-use-short-tmp.diff, i#68888, tml
+
+-# LFS support
+-lfs.diff, i#26865, rengelha
+-
+ # fix build with system libnss installed apart from mozilla
+ # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
+ libxmlsec-system-nss.diff, i#69368, pmladek
================================================================
Index: SOURCES/openoffice.org-portaudio_v19.diff
diff -u /dev/null SOURCES/openoffice.org-portaudio_v19.diff:1.1
--- /dev/null Tue Oct 24 23:41:11 2006
+++ SOURCES/openoffice.org-portaudio_v19.diff Tue Oct 24 23:41:06 2006
@@ -0,0 +1,65 @@
+--- config_office/configure.in.orig 2006-08-16 15:00:25.000000000 +0000
++++ config_office/configure.in 2006-08-16 15:03:25.000000000 +0000
+@@ -3825,12 +3825,6 @@
+ AC_CHECK_LIB(portaudio, Pa_Initialize, [],
+ [AC_MSG_ERROR(portaudio library not found or functional)], [])
+ AC_MSG_CHECKING(portaudio version)
+- AC_TRY_LINK([#include <portaudio.h>], [
+-void main(int argc, char **argv) {
+- /* Pa_GetVersion() only exists in v19, so this fails to build with v18 */
+- int v = Pa_GetVersion();
+-}
+- ], [AC_MSG_ERROR([portaudio too new. you need v18])], [AC_MSG_RESULT([OK, v18])])
+ SYSTEM_PORTAUDIO=YES
+ else
+ AC_MSG_RESULT([internal])
+--- vcl/unx/source/app/salimpsound.hxx.orig 2006-08-17 04:38:53.000000000 +0000
++++ vcl/unx/source/app/salimpsound.hxx 2006-08-17 04:39:02.000000000 +0000
+@@ -190,7 +190,7 @@
+
+ typedef struct
+ {
+- PaDeviceID device;
++ PaDeviceIndex device;
+ PaSampleFormat format;
+ unsigned int bufsize;
+ SNDFILE *sndfile;
+--- vcl/unx/source/app/pasfsound.cxx.orig 2006-08-17 04:53:09.000000000 +0000
++++ vcl/unx/source/app/pasfsound.cxx 2006-08-17 05:09:12.000000000 +0000
+@@ -61,8 +61,9 @@
+
+ /* callback that takes data from sound file and converts it and loads it */
+
+- static int pasf_in_out_callback (void *inputBuffer, void * outputBuffer,
+- unsigned long framesPerBuffer, PaTimestamp outTime, void * userData )
++ static int pasf_in_out_callback (const void *inputBuffer, void * outputBuffer,
++ unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo* timeInfo,
++ PaStreamCallbackFlags statusFlags, void * userData )
+ {
+ PASFAudioData* paudio_data;
+ unsigned int read_count, bufoff, bytecnt;
+@@ -70,7 +71,6 @@
+
+ /* prevent warnings for unused variables */
+ inputBuffer = inputBuffer;
+- outTime = outTime;
+
+ /* get all other info needed from audio_data structure passed in as userData */
+ paudio_data = (PASFAudioData*) userData;
+@@ -139,7 +139,7 @@
+ m_pData->bufsize = PASF_BUFFER_LEN;
+
+ // Using the default output device for this
+- m_pData->device = Pa_GetDefaultOutputDeviceID();
++ m_pData->device = Pa_GetDefaultOutputDevice();
+
+ // the size of a frame in bytes is the number of channels of data * the size of the
+ // underlying data type type being used to store data for each for each channel
+@@ -156,7 +156,6 @@
+ m_pData->format, // 32 bit floating point format for each item
+ m_pData->sfinfo.samplerate, // get desired sampling rate from file
+ framesPerBuffer, // frames per buffer
+- 0, // number of buffers, if zero then use optimal number as determined by Pa
+ pasf_in_out_callback, // call back to load data into the stream
+ m_pData ); // pass along m_pData pointer so that callback can get access to info
+
================================================================
Index: SOURCES/openoffice.org-regcomp_ugly_hack.diff
diff -u /dev/null SOURCES/openoffice.org-regcomp_ugly_hack.diff:1.1
--- /dev/null Tue Oct 24 23:41:11 2006
+++ SOURCES/openoffice.org-regcomp_ugly_hack.diff Tue Oct 24 23:41:06 2006
@@ -0,0 +1,9 @@
+--- solver/680/unxlngi6.pro/bin/regcomp.orig 2006-10-24 18:20:46.641885250 +0200
++++ solver/680/unxlngi6.pro/bin/regcomp 2006-10-24 18:21:18.491875750 +0200
+@@ -144,5 +144,5 @@
+
+
+ # execute binary
+-exec "$sd_prog/$sd_binary" "$@"
++strace -e execve "$sd_prog/$sd_binary" "$@"
+
================================================================
Index: SOURCES/openoffice.org-stl5_fix.patch
diff -u /dev/null SOURCES/openoffice.org-stl5_fix.patch:1.1
--- /dev/null Tue Oct 24 23:41:11 2006
+++ SOURCES/openoffice.org-stl5_fix.patch Tue Oct 24 23:41:06 2006
@@ -0,0 +1,28 @@
+--- ooo-build-src680-m176/patches/src680/system-stlport5.diff.orig 2006-08-16 11:03:36.000000000 +0000
++++ ooo-build-src680-m176/patches/src680/system-stlport5.diff 2006-08-16 11:04:16.000000000 +0000
+@@ -381,3 +381,25 @@
+
+ for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+ {
++--- scp2/source/ooo/file_library_ooo.scp.orig 2006-08-15 21:29:35.000000000 +0000
+++++ scp2/source/ooo/file_library_ooo.scp 2006-08-15 21:30:45.000000000 +0000
++@@ -2045,7 +2045,7 @@
++ #ifdef IRIX
++ Name = STRING(CONCAT3(libstlport_,gcc,.so.4.5));
++ #else
++- Name = STRING(CONCAT3(libstlport_,gcc,UNXSUFFIX));
+++ Name = STRING(CONCAT2(libstlport,UNXSUFFIX));
++ #endif
++ #else
++ #ifdef SOLARIS
++--- scp2/source/ure/ure.scp.orig 2006-08-15 21:31:54.000000000 +0000
+++++ scp2/source/ure/ure.scp 2006-08-15 21:32:19.000000000 +0000
++@@ -592,7 +592,7 @@
++ TXT_FILE_BODY;
++ Dir = SCP2_URE_DL_DIR;
++ #if defined _gcc3
++- Name = SCP2_URE_DL_NORMAL(stlport_gcc);
+++ Name = SCP2_URE_DL_NORMAL(stlport);
++ #elif defined SOLARIS
++ Name = SCP2_URE_DL_NORMAL(stlport_sunpro);
++ #elif defined WNT
================================================================
More information about the pld-cvs-commit
mailing list