Menu
▾
▴
CVS: dists/10.2/unstable/main/finkinfo/kde koffice-1.2.0-1.info,NONE,1.1 koffice-1.2.0-1.patch,NONE,1.1 koffice-1.2rc1-2.info,1.1,NONE koffice-1.2rc1-2.patch,1.1,NONE
|
From: Benjamin R. <ran...@us...> - 2002-09-13 13:13:47
|
Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/kde In directory usw-pr-cvs1:/tmp/cvs-serv2185 Added Files: koffice-1.2.0-1.info koffice-1.2.0-1.patch Removed Files: koffice-1.2rc1-2.info koffice-1.2rc1-2.patch Log Message: new upstream release of koffice --- NEW FILE: koffice-1.2.0-1.info --- Package: koffice Version: 1.2.0 Revision: 1 GCC: 3.1 Depends: karbon (>= %v-%r), kchart (>= %v-%r), kformula (>= %v-%r), kivio (>= %v-%r), kontour (>= %v-%r), kpresenter (>= %v-%r), kspread (>= %v-%r), kugar (>= %v-%r), kword (>= %v-%r), kdebase3-ssl (>= %v-2) | kdebase3 (>= %v-2), kdelibs3-ssl (>= %v-2) | kdelibs3 (>= %v-2) BuildDepends: qt3 (>= 3.0.5-5), arts-dev (>= 1.1.0-2), kdelibs3-ssl-dev (>= 3.0.7-2) | kdelibs3-dev (>= 3.0.7-2), kdebase3-ssl-dev (>= 3.0.7-2) | kdebase3-dev (>= 3.0.7-2), automake (>= 1.6), autoconf25, libtool14, fink (>= 0.10.0), python (>= 2.2.1-8) | python-nox (>= 2.2.1-8), libart2 (>= 2.3.9), libxml2 (>= 2.4.23-4), libxslt (>= 1.0.18-3), audiofile (>= 0.2.3), dlcompat (>= 20020709), esound (>= 0.2.28), freetype2 (>= 2.0.8), libjpeg (>= 6b), libpng (>= 1.0.12), libpoll (>= 1.1) Replaces: %N-common (<< %v-%r), %N-dev (<< %v-%r) Conflicts: %N-common (<< %v-%r), %N-dev (<< %v-%r) Maintainer: Benjamin Reed <ra...@be...> Source: ftp://ftp.kde.org/pub/kde/stable/%n-1.2/src/%n-1.2.tar.bz2 Source-MD5: 34cb13104bc1d4f0916b0dda6dec7ee0 PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p0 SetLDFLAGS: -L%p/lib SetCPPFLAGS: -no-cpp-precomp SetCFLAGS: -fno-common ConfigureParams: --prefix=%p --with-qt-dir=%p --with-extra-libs=%p/lib --with-extra-includes=%p/include --enable-mt --with-pic --enable-rpath --enable-shared=yes --enable-static=yes --mandir=%i/share/man --with-xinerama --enable-final `cat /tmp/kde-build-options` CompileScript: << make -f Makefile.cvs (export KDEDIR=%p; sh configure %c; make) << InstallScript: << make install DESTDIR=%d << DocFiles: AUTHORS COPYING* ChangeLog INSTALL NEWS PROFILING README Description: KDE - Office Suite DescDetail: << The KDE Office Suite. Install the koffice package if you want to install all koffice applications. Included packages are: karbon kchart kformula kivio kontour kpresenter kspread kugar kword << License: GPL/LGPL SplitOff: << Package: koffice-dev BuildDependsOnly: true Depends: %N (>= %v-%r) Recommends: arts-dev (>= 1.1.0-2), kdelibs3-ssl-dev (>= 3.0.7-2) | kdelibs3-dev (>= 3.0.7-2), kdebase3-ssl-dev (>= 3.0.7-2) | kdebase3-dev (>= 3.0.7-2), qt3 (>= 3.0.5-2), libart2 (>= 2.3.8), libxml2 (>= 2.4.23-4), libxslt (>= 1.0.18-3), audiofile (>= 0.2.3), dlcompat (>= 20020709), esound (>= 0.2.28), freetype2 (>= 2.0.8), libjpeg (>= 6b), libpng (>= 1.0.12), libpoll (>= 1.1) Description: Development headers and libraries for the KDE Office Suite. Files: << include lib/*.a lib/kde3/*.a lib/kde3/libkarbonaiimport.dylib lib/libkformula.dylib lib/libkwordexportfilters.dylib lib/libkwmailmerge_interface.dylib lib/libkwmf.dylib << Replaces: %N-common (<< %v-%r), %N (<< %v-%r) << SplitOff2: << Package: karbon Depends: dlcompat (>= 20020709), freetype2-shlibs (>= 2.0.8), kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), %N-common (= %v-%r), libart2-shlibs (>= 2.3.9), libpng-shlibs (>= 1.0.12), qt3-shlibs (>= 3.0.5-5), x11 Recommends: %N (>= %v-%r) BuildDependsOnly: true Description: KDE - vector-based drawing program Files: << bin/karbon lib/karbon.* lib/kde3/libkarbon* share/applnk/Office/karbon.desktop share/apps/karbon share/icons/hicolor/16x16/apps/karbon.png share/icons/hicolor/32x32/apps/karbon.png share/icons/hicolor/48x48/apps/karbon.png << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r) << SplitOff3: << Package: kchart Depends: dlcompat (>= 20020709), kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), %N-common (= %v-%r), libart2-shlibs (>= 2.3.9), libpng-shlibs (>= 1.0.12), qt3-shlibs (>= 3.0.5-5), x11 Recommends: %N (>= %v-%r) BuildDependsOnly: true Description: KDE - charting and diagram drawing Files: << bin/kchart lib/kchart.* lib/kde3/libkchart* share/applnk/Office/kchart.desktop share/doc/HTML/en/kchart share/apps/kchart share/icons/hicolor/16x16/apps/kchart.png share/icons/hicolor/32x32/apps/kchart.png share/icons/hicolor/48x48/apps/kchart.png << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r) << SplitOff4: << Package: kformula Depends: dlcompat (>= 20020709), kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), %N-common (= %v-%r), libart2-shlibs (>= 2.3.9), libpng-shlibs (>= 1.0.12), qt3-shlibs (>= 3.0.5-5), x11 Recommends: %N (>= %v-%r) BuildDependsOnly: true Description: KDE - formula editor Files: << bin/kformula lib/kde3/libkformula* lib/kformula* share/applnk/Office/kformula.desktop share/apps/kformula share/doc/HTML/en/kformula share/icons/hicolor/16x16/apps/kformula.png share/icons/hicolor/32x32/apps/kformula.png share/icons/hicolor/48x48/apps/kformula.png << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r) << SplitOff5: << Package: kivio Depends: dlcompat (>= 20020709), kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), %N-common (= %v-%r), libart2-shlibs (>= 2.3.9), libpng-shlibs (>= 1.0.12), python (>= 2.2.1-8) | python-nox (>= 2.2.1-8), qt3-shlibs (>= 3.0.5-5), x11 Recommends: %N (>= %v-%r) BuildDependsOnly: true Description: KDE - flowchart program Files: << bin/kivio lib/kde3/libkivio* lib/kivio* lib/libkivio* share/applnk/Office/kivio.desktop share/apps/kivio share/icons/hicolor/16x16/apps/kivio.png share/icons/hicolor/22x22/apps/kivio.png share/icons/hicolor/32x32/apps/kivio.png share/icons/hicolor/48x48/apps/kivio.png << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r) << SplitOff6: << Package: kontour Depends: dlcompat (>= 20020709), kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), %N-common (= %v-%r), libart2-shlibs (>= 2.3.9), libpng-shlibs (>= 1.0.12), qt3-shlibs (>= 3.0.5-5), x11 Recommends: %N (>= %v-%r) BuildDependsOnly: true Description: KDE - vector drawing program Files: << bin/kontour lib/kde3/libkontour* lib/kontour* share/applnk/Office/kontour.desktop share/apps/kontour share/icons/hicolor/16x16/apps/kontour.png share/icons/hicolor/32x32/apps/kontour.png share/icons/hicolor/48x48/apps/kontour.png << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r) << SplitOff7: << Package: kpresenter Depends: arts (>= 1.1.0-2), audiofile-shlibs (>= 0.2.3), dlcompat (>= 20020709), esound-shlibs (>= 0.2.28), kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), %N-common (= %v-%r), libart2-shlibs (>= 2.3.9), libpng-shlibs (>= 1.0.12), libpoll-shlibs (>= 1.1), qt3-shlibs (>= 3.0.5-5), x11 Recommends: %N (>= %v-%r) BuildDependsOnly: true Description: KDE - PowerPoint-like presentation app Files: << bin/kpresenter lib/kde3/libkpresenter* lib/kpresenter* share/applnk/Office/kpresenter.desktop share/apps/kpresenter share/doc/HTML/en/kpresenter share/icons/hicolor/16x16/apps/kpresenter.png share/icons/hicolor/32x32/apps/kpresenter.png share/icons/hicolor/48x48/apps/kpresenter.png << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r) << SplitOff8: << Package: kspread Depends: dlcompat (>= 20020709), kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), %N-common (= %v-%r), libart2-shlibs (>= 2.3.9), libpng-shlibs (>= 1.0.12), qt3-shlibs (>= 3.0.5-5), x11 Recommends: %N (>= %v-%r) BuildDependsOnly: true Description: KDE - spreadsheet Files: << bin/kspread lib/kde3/libkspread* lib/kspread* share/applnk/Office/kspread.desktop share/apps/kspread share/doc/HTML/en/kspread share/icons/hicolor/16x16/apps/kspread.png share/icons/hicolor/32x32/apps/kspread.png share/icons/hicolor/48x48/apps/kspread.png share/icons/locolor/16x16/apps/kspreadcalc.png share/icons/locolor/22x22/apps/kspreadcalc.png share/icons/locolor/32x32/apps/kspreadcalc.png << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r) << SplitOff9: << Package: kugar Depends: dlcompat (>= 20020709), kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), %N-common (= %v-%r), libart2-shlibs (>= 2.3.9), libpng-shlibs (>= 1.0.12), qt3-shlibs (>= 3.0.5-5), x11 Recommends: %N (>= %v-%r) BuildDependsOnly: true Description: KDE - business report viewer and creator Files: << bin/kugar bin/kudesigner lib/libkugarpart* share/applnk/Office/kudesigner.desktop share/applnk/Office/kugar.desktop share/apps/kudesigner share/apps/kugar share/doc/HTML/en/kugar share/icons/hicolor/16x16/apps/kugar.png share/icons/hicolor/16x16/mimetypes/kugardata.png share/icons/hicolor/22x22/apps/kugar.png share/icons/hicolor/22x22/mimetypes/kugardata.png share/icons/hicolor/32x32/apps/kugar.png share/icons/hicolor/32x32/mimetypes/kugardata.png share/icons/hicolor/48x48/apps/kugar.png share/icons/hicolor/48x48/mimetypes/kugardata.png share/icons/locolor/16x16/apps/kudesigner.png share/icons/locolor/32x32/apps/kudesigner.png << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r) << SplitOff10: << Package: kword Depends: dlcompat (>= 20020709), kformula (= %v-%r), kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), %N-common (= %v-%r), libart2-shlibs (>= 2.3.9), libpng-shlibs (>= 1.0.12), qt3-shlibs (>= 3.0.5-5), x11 Recommends: %N (>= %v-%r) BuildDependsOnly: true Description: KDE - word processoor Files: << bin/kword lib/kde3/libkprkword* lib/kde3/libkwordpart* lib/kde3/kwmailmerge* lib/kword* lib/libkwmailmerge* share/applnk/Office/kword.desktop share/apps/kword share/doc/HTML/en/kword share/icons/hicolor/16x16/apps/kword.png share/icons/hicolor/32x32/apps/kword.png share/icons/hicolor/48x48/apps/kword.png << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r) << SplitOff11: << Package: %N-common BuildDependsOnly: true Description: KDE - files used by all of KOffice Files: << bin lib share << Replaces: %N-common (<< %v-%r), %N (<< %v-%r), %N-dev (<< %v-%r), karbon (<< %v-%r), kformula (<< %v-%r), kivio (<< %v-%r), kontour (<< %v-%r), kspread (<< %v-%r), kword (<< %v-%r) << --- NEW FILE: koffice-1.2.0-1.patch --- Index: admin/Makefile.common =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/admin/Makefile.common,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -u -b -u -r1.1.1.2 -r1.3 Index: admin/acinclude.m4.in =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/admin/acinclude.m4.in,v retrieving revision 1.1.1.4 retrieving revision 1.5 diff -u -b -u -r1.1.1.4 -r1.5 --- admin/acinclude.m4.in 12 Sep 2002 12:42:16 -0000 1.1.1.4 +++ admin/acinclude.m4.in 12 Sep 2002 12:53:51 -0000 1.5 @@ -699,13 +699,10 @@ AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")) # darwin needs this to initialize the environment - AC_CHECK_HEADERS(crt_externs.h) + AC_CHECK_HEADERS([crt_externs.h sys/types.h]) AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])]) - # more headers that need to be explicitly included on darwin - AC_CHECK_HEADERS(sys/types.h stdint.h) - - # darwin requires a poll emulation library + # darwin requires a poll.h emulation library AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll") # CoreAudio framework @@ -736,6 +733,8 @@ AC_SUBST(FRAMEWORK_COREAUDIO) LIBSOCKET="$X_EXTRA_LIBS" AC_SUBST(LIBSOCKET) + AC_SUBST(FRAMEWORK_COREAUDIO) + AC_SUBST(LIB_POLL) AC_SUBST(LIBRESOLV) AC_SUBST(X_EXTRA_LIBS) AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4 @@ -1846,15 +1845,29 @@ AC_REQUIRE([K_PATH_X]) if test $kde_qtver = 3; then + AC_SUBST(LIB_ARTSKDE, "-lartskde") + AC_SUBST(LIB_DCOP, "-lDCOP") + AC_SUBST(LIB_KAB, "-lkab") + AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KDECORE, "-lkdecore") + AC_SUBST(LIB_KDED, "@PREFIX@/lib/kded.la") + AC_SUBST(LIB_KDEFX, "-lkdefx") + AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_KDESASL, "-lkdesasl") + AC_SUBST(LIB_KDESU, "-lkdesu") AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") + AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_KJAVA, "-lkjava") + AC_SUBST(LIB_KJS, "-lkjs") + AC_SUBST(LIB_KMID, "-lkmid") + AC_SUBST(LIB_KSCRIPT, "-lkscript") + AC_SUBST(LIB_KSPELL, "-lkspell") + AC_SUBST(LIB_KTEXTEDITOR, "-lktexteditor") + AC_SUBST(LIB_SHELLSCRIPT, "-lshellscript") + AC_SUBST(LIB_SMB, "-lsmb") + AC_SUBST(LIB_VCARD, "-lvcard") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -4106,7 +4119,7 @@ AC_DEFUN(KDE_CREATE_SUBDIRSLIST, [ -DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" +DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin kdm ksysguard kscd" if test ! -s $srcdir/subdirs; then dnl Note: Makefile.common creates subdirs, so this is just a fallback @@ -4339,6 +4352,12 @@ # And delete superflous '/' to make compares easier prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` + # For unsermake we let top_builddir be absolute, instead of a + # ../.. cascade to make dependencies for better from subdirectories + # This doesn't change the behaviour of automake, as there the + # top_builddir line is hardcoded into the Makefile.in's. + top_builddir=`pwd` + AC_SUBST(top_builddir) KDE_FAST_CONFIGURE KDE_CONF_FILES ]) @@ -4554,6 +4573,7 @@ KDE_JAVA_PREFIX(/usr/lib/IBMJava2*) KDE_JAVA_PREFIX(/usr/lib/IBMJava*) KDE_JAVA_PREFIX(/opt/java*) + KDE_JAVA_PREFIX(/Library/Java/Home) kde_cv_path="NONE" kde_save_IFS=$IFS @@ -4605,6 +4625,14 @@ dnl At this point kde_java_bindir and kde_java_includedir are either set or "no" if test "x$kde_java_bindir" != "xno"; then + case $host_os in + darwin*) + dnl Look for libjvm.dylib + kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.dylib | sed 's,libjvm.dylib,,'|head -n 1` + kd_java_libhpidir='' + dnl Darwin doesn't have libhpi + ;; + *) dnl Look for libjvm.so kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` dnl Look for libhpi.so and avoid green threads @@ -4637,17 +4665,29 @@ JAVAC= jni_includes= fi - + case $host_os in + darwin*) + if test ! -r "$kde_java_libjvmdir/libjvm.dylib"; then + AC_MSG_ERROR([libjvm.dylib not found under $kde_java_libjvmdir. Use --without-java.]) + fi + dnl Darwin doesn't have libhpi, but it's not fatal + LIB_JVM="-framework JavaVM" + LIB_HPI="" + ;; + *) if test ! -r "$kde_java_libjvmdir/libjvm.so"; then AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.]) fi + LIB_JVM="-L$kde_java_libjvmdir -ljvm" + if test ! -r "$kde_java_libhpidir/libhpi.so"; then + AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.]) + fi + LIB_HPI="-L$kde_java_libhpidir -lhpi" + ;; + esac if test ! -x "$kde_java_bindir/java"; then AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) - fi - - if test ! -r "$kde_java_libhpidir/libhpi.so"; then - AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.]) fi if test -n "$jni_includes"; then Index: admin/am_edit =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/admin/am_edit,v retrieving revision 1.1.1.4 retrieving revision 1.6 diff -u -b -u -r1.1.1.4 -r1.6 Index: admin/cvs.sh =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/admin/cvs.sh,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 Index: admin/debianrules =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/admin/debianrules,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -b -u -r1.1.1.2 -r1.2 Index: admin/depcomp =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/admin/depcomp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -b -u -r1.1.1.2 -r1.2 Index: admin/libtool.m4.in =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/admin/libtool.m4.in,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 --- admin/libtool.m4.in 10 Aug 2002 13:45:40 -0000 1.1.1.3 +++ admin/libtool.m4.in 10 Aug 2002 14:07:14 -0000 1.4 @@ -609,6 +609,12 @@ lt_cv_sys_max_cmd_len=-1; ;; + darwin*) + # this should be enough... the length test freaks out some versions + # of OSX's `expr` + lt_cv_sys_max_cmd_len=16384; + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but @@ -1901,16 +1907,7 @@ ;; darwin* | rhapsody*) - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[[012]]) - lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac + lt_cv_deplibs_check_method='pass_all' ;; freebsd*) @@ -2560,6 +2557,11 @@ ;; esac ;; + darwin*) + shared_flag='-dynamiclib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC -dynamiclib -install_name $rpath/$soname $predep_objects ${lib}-master.o $deplibs $postdep_objects $compiler_flags -o $lib' + output_verbose_link_cmd='$CC -dynamiclib $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"' + ;; dgux*) case $cc_basename in ec++) @@ -4750,7 +4752,9 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' ;; *) # Darwin 1.3 on - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + #_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + # testing with twolevel namespaces + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ;; esac @@ -4758,7 +4762,7 @@ # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. Also zsh mangles # `"' quotes if we put them in here... so don't! - _LT_AC_TAGVAR(archive_cmds, $1)='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) -install_name $rpath/$soname $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $linker_flags $verstring' # We need to add '_' to the symbols in $export_symbols first #_LT_AC_TAGVAR(archive_expsym_cmds, $1)="$_LT_AC_TAGVAR(archive_cmds, $1)"' && strip -s $export_symbols' _LT_AC_TAGVAR(hardcode_direct, $1)=yes Index: admin/ltmain.sh =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/admin/ltmain.sh,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -u -b -u -r1.1.1.2 -r1.3 --- admin/ltmain.sh 20 Jun 2002 04:48:38 -0000 1.1.1.2 +++ admin/ltmain.sh 10 Jul 2002 21:18:18 -0000 1.3 @@ -3321,7 +3321,18 @@ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else + save_deplibs="$deplibs" + for conv in $convenience; do + tmp_deplibs= + for test_deplib in $deplibs; do + if test "$test_deplib" != "$conv"; then + tmp_deplibs="$tmp_deplibs $test_deplib" + fi + done + deplibs="$tmp_deplibs" + done eval cmds=\"$archive_cmds\" + deplibs="$save_deplibs" fi if len=`expr "X$cmds" : ".*"` && @@ -3632,6 +3643,14 @@ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ;; + esac + + case $host in + *darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" + ;; esac compile_command="$compile_command $compile_deplibs" Index: admin/missing =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/admin/missing,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -u -b -u -r1.1.1.2 -r1.3 --- admin/missing 20 Jun 2002 04:48:38 -0000 1.1.1.2 +++ admin/missing 10 Jul 2002 21:18:18 -0000 1.3 @@ -106,7 +106,7 @@ exit 1 ;; - aclocal) + aclocal*) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want @@ -143,7 +143,7 @@ touch $touch_files ;; - automake) + automake*) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. Index: doc/kformula/esstix-kfo1.png =================================================================== RCS file: doc/kformula/esstix-kfo1.png diff -N doc/kformula/esstix-kfo1.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kformula/esstix-kfo2.png =================================================================== RCS file: doc/kformula/esstix-kfo2.png diff -N doc/kformula/esstix-kfo2.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kformula/esstix-kfo3.png =================================================================== RCS file: doc/kformula/esstix-kfo3.png diff -N doc/kformula/esstix-kfo3.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kformula/index.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kformula/index.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 Index: doc/koffice/index.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/koffice/index.docbook,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -b -u -r1.1.1.2 -r1.2 Index: doc/koshell/index.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/koshell/index.docbook,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -b -u -r1.1.1.2 -r1.2 Index: doc/kpresenter/index.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kpresenter/index.docbook,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -b -u -r1.1.1.2 -r1.2 Index: doc/kspread/index.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kspread/index.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 Index: doc/kugar/index.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kugar/index.docbook,v retrieving revision 1.1.1.4 retrieving revision 1.4 diff -u -b -u -r1.1.1.4 -r1.4 Index: doc/kword/cancel.png =================================================================== RCS file: doc/kword/cancel.png diff -N doc/kword/cancel.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/clipart-from-file.png =================================================================== RCS file: doc/kword/clipart-from-file.png diff -N doc/kword/clipart-from-file.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/clipart.png =================================================================== RCS file: doc/kword/clipart.png diff -N doc/kword/clipart.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/close.png =================================================================== RCS file: doc/kword/close.png diff -N doc/kword/close.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/columns.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/columns.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.3 diff -u -b -u -r1.1.1.3 -r1.3 Index: doc/kword/delete-table-col.png =================================================================== RCS file: doc/kword/delete-table-col.png diff -N doc/kword/delete-table-col.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/delete-table-row.png =================================================================== RCS file: doc/kword/delete-table-row.png diff -N doc/kword/delete-table-row.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/details.png =================================================================== RCS file: doc/kword/details.png diff -N doc/kword/details.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/dtpfmtpg2.png =================================================================== RCS file: doc/kword/dtpfmtpg2.png diff -N doc/kword/dtpfmtpg2.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/edit.png =================================================================== RCS file: doc/kword/edit.png diff -N doc/kword/edit.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/editing.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/editing.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 Index: doc/kword/editspace.png =================================================================== RCS file: doc/kword/editspace.png diff -N doc/kword/editspace.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/exit.png =================================================================== RCS file: doc/kword/exit.png diff -N doc/kword/exit.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/extra.png =================================================================== RCS file: doc/kword/extra.png diff -N doc/kword/extra.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/fcrtb.png =================================================================== RCS file: doc/kword/fcrtb.png diff -N doc/kword/fcrtb.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/file.png =================================================================== RCS file: doc/kword/file.png diff -N doc/kword/file.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/filequickprint.png =================================================================== RCS file: doc/kword/filequickprint.png diff -N doc/kword/filequickprint.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/footdlg.png =================================================================== RCS file: doc/kword/footdlg.png diff -N doc/kword/footdlg.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/format.png =================================================================== RCS file: doc/kword/format.png diff -N doc/kword/format.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/formatchar.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/formatchar.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 Index: doc/kword/formatpara.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/formatpara.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.3 diff -u -b -u -r1.1.1.3 -r1.3 Index: doc/kword/framemode.png =================================================================== RCS file: doc/kword/framemode.png diff -N doc/kword/framemode.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/headerfooter.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/headerfooter.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.3 diff -u -b -u -r1.1.1.3 -r1.3 Index: doc/kword/index.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/index.docbook,v retrieving revision 1.1.1.4 retrieving revision 1.5 diff -u -b -u -r1.1.1.4 -r1.5 Index: doc/kword/insert-table-col.png =================================================================== RCS file: doc/kword/insert-table-col.png diff -N doc/kword/insert-table-col.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/insert-table-row.png =================================================================== RCS file: doc/kword/insert-table-row.png diff -N doc/kword/insert-table-row.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/insert.png =================================================================== RCS file: doc/kword/insert.png diff -N doc/kword/insert.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/inssc.png =================================================================== RCS file: doc/kword/inssc.png diff -N doc/kword/inssc.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/italic.png =================================================================== RCS file: doc/kword/italic.png diff -N doc/kword/italic.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/lists.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/lists.docbook,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -b -u -r1.1.1.2 -r1.2 Index: doc/kword/lspcbut.png =================================================================== RCS file: doc/kword/lspcbut.png diff -N doc/kword/lspcbut.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/mbtb.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/mbtb.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 Index: doc/kword/neonpen.png =================================================================== RCS file: doc/kword/neonpen.png diff -N doc/kword/neonpen.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/newfolder.png =================================================================== RCS file: doc/kword/newfolder.png diff -N doc/kword/newfolder.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/nodet.png =================================================================== RCS file: doc/kword/nodet.png diff -N doc/kword/nodet.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/ok.png =================================================================== RCS file: doc/kword/ok.png diff -N doc/kword/ok.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/opt.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/opt.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 Index: doc/kword/part-kchart.png =================================================================== RCS file: doc/kword/part-kchart.png diff -N doc/kword/part-kchart.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/part-killustrator.png =================================================================== RCS file: doc/kword/part-killustrator.png diff -N doc/kword/part-killustrator.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/part-kimage.png =================================================================== RCS file: doc/kword/part-kimage.png diff -N doc/kword/part-kimage.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/part-kimageshop.png =================================================================== RCS file: doc/kword/part-kimageshop.png diff -N doc/kword/part-kimageshop.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/part-kword.png =================================================================== RCS file: doc/kword/part-kword.png diff -N doc/kword/part-kword.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/part-unspecif.png =================================================================== RCS file: doc/kword/part-unspecif.png diff -N doc/kword/part-unspecif.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/parts.png =================================================================== RCS file: doc/kword/parts.png diff -N doc/kword/parts.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/product.png =================================================================== RCS file: doc/kword/product.png diff -N doc/kword/product.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/styles.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/styles.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 Index: doc/kword/table.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/kword/table.docbook,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -u -b -u -r1.1.1.3 -r1.4 Index: doc/kword/table.png =================================================================== RCS file: doc/kword/table.png diff -N doc/kword/table.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/text-bold.png =================================================================== RCS file: doc/kword/text-bold.png diff -N doc/kword/text-bold.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/text-italic.png =================================================================== RCS file: doc/kword/text-italic.png diff -N doc/kword/text-italic.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/text-underlined.png =================================================================== RCS file: doc/kword/text-underlined.png diff -N doc/kword/text-underlined.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/textmode.png =================================================================== RCS file: doc/kword/textmode.png diff -N doc/kword/textmode.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/tools.png =================================================================== RCS file: doc/kword/tools.png diff -N doc/kword/tools.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/underl.png =================================================================== RCS file: doc/kword/underl.png diff -N doc/kword/underl.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/uplevel.png =================================================================== RCS file: doc/kword/uplevel.png diff -N doc/kword/uplevel.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/kword/view.png =================================================================== RCS file: doc/kword/view.png diff -N doc/kword/view.png Binary files /dev/null and /tmp/cvs017168 differ Index: doc/thesaurus/index.docbook =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/doc/thesaurus/index.docbook,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -u -b -u -r1.1.1.2 -r1.3 Index: filters/karbon/ai/ailexer.cc =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/filters/karbon/ai/ailexer.cc,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -b -u -r1.1.1.3 -r1.2 --- filters/karbon/ai/ailexer.cc 10 Aug 2002 13:48:20 -0000 1.1.1.3 +++ filters/karbon/ai/ailexer.cc 12 Aug 2002 01:08:39 -0000 1.2 @@ -38,9 +38,11 @@ return (c==' ')||(c=='\n')||(c=='\t')||(c=='\r'); } +#ifndef isspecial int isspecial(char c){ return (c=='*')||(c=='_')||(c=='?')||(c=='~')||(c=='-')||(c=='^')||(c=='`')||(c=='!')||(c=='.')||(c=='@')||(c=='&')||(c=='$')||(c=='='); } +#endif int isletterhex(char c){ return (c=='A')||(c=='B')||(c=='C')||(c=='D')||(c=='E')||(c=='F'); Index: filters/kword/latex/import/parser/Makefile.am =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/filters/kword/latex/import/parser/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -b -u -r1.1.1.1 -r1.2 --- filters/kword/latex/import/parser/Makefile.am 20 Jun 2002 04:49:28 -0000 1.1.1.1 +++ filters/kword/latex/import/parser/Makefile.am 22 Jun 2002 19:05:09 -0000 1.2 @@ -2,7 +2,7 @@ INCLUDES= -I$(srcdir) $(all_includes) liblatexparser_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -liblatexparser_la_LIBADD = -lfl -lm $(KOFFICE_LIBS) +liblatexparser_la_LIBADD = -ll -lm $(KOFFICE_LIBS) ####### Files Index: filters/xsltfilter/export/Makefile.am =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/filters/xsltfilter/export/Makefile.am,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -b -u -r1.1.1.2 -r1.2 --- filters/xsltfilter/export/Makefile.am 20 Jun 2002 04:49:37 -0000 1.1.1.2 +++ filters/xsltfilter/export/Makefile.am 20 Jun 2002 04:48:28 -0000 1.2 @@ -1,9 +1,9 @@ ####### General stuff -SUBDIRS = xsl -INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) +KDE_INCLUDES=$(KDEDIR)/include +INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) -I$(KDE_INCLUDES)/libxml2 -I$(KDE_INCLUDES)/libxslt $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) -AM_CPPFLAGS = -DSRCDIR="\"$(shell (cd $(top_srcdir)/filters/xsltfilter/export && pwd))\"" +AM_CPPFLAGS = -DSRCDIR="\"$(shell (cd $(srcdir) && pwd))\"" ####### Files Index: filters/xsltfilter/import/Makefile.am =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/filters/xsltfilter/import/Makefile.am,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -b -u -r1.1.1.2 -r1.2 --- filters/xsltfilter/import/Makefile.am 20 Jun 2002 04:49:38 -0000 1.1.1.2 +++ filters/xsltfilter/import/Makefile.am 20 Jun 2002 04:48:28 -0000 1.2 @@ -1,7 +1,8 @@ ####### General stuff -INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) -AM_CPPFLAGS = -DSRCDIR="\"$(shell (cd $(top_srcdir)/filters/xsltfilter/import && pwd))\"" +KDE_INCLUDES=$(KDEDIR)/include +INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) -I$(KDE_INCLUDES)/libxml2 -I$(KDE_INCLUDES)/libxslt $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) +AM_CPPFLAGS = -DSRCDIR="\"$(shell (cd $(srcdir) && pwd))\"" ####### Files Index: karbon/render/xrgbrender/gdk-pixbuf-xlib-private.h =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/karbon/render/xrgbrender/gdk-pixbuf-xlib-private.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -b -u -r1.1.1.1 -r1.2 --- karbon/render/xrgbrender/gdk-pixbuf-xlib-private.h 20 Jun 2002 04:43:15 -0000 1.1.1.1 +++ karbon/render/xrgbrender/gdk-pixbuf-xlib-private.h 20 Jun 2002 04:48:28 -0000 1.2 @@ -31,5 +31,11 @@ #define KSVG_BIG_ENDIAN 2 /* FIXME: Make this auto-detectable */ +/* FIXME AGAIN: probably only Apple Compilers define this */ +#ifdef __BIG_ENDIAN__ +#define KSVG_BYTE_ORDER KSVG_BIG_ENDIAN +#else #define KSVG_BYTE_ORDER KSVG_LITTLE_ENDIAN +#endif + #endif Index: kchart/kdchart/KDChart.h =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/kchart/kdchart/KDChart.h,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -u -b -u -r1.1.1.2 -r1.3 Index: kchart/kdchart/KDChartTable.h =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/kchart/kdchart/KDChartTable.h,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -u -b -u -r1.1.1.2 -r1.3 Index: kchart/kdchart/Makefile.am =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/kchart/kdchart/Makefile.am,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -u -b -u -r1.1.1.2 -r1.3 --- kchart/kdchart/Makefile.am 20 Jun 2002 04:49:58 -0000 1.1.1.2 +++ kchart/kdchart/Makefile.am 22 Jun 2002 14:26:30 -0000 1.3 @@ -1,5 +1,7 @@ lib_LTLIBRARIES = libkdchart.la +libkdchart_la_LIBADD = $(all_libraries) $(LIB_QT) + libkdchart_la_SOURCES = KDChart.cpp \ KDChartAreaPainter.cpp \ KDChartAxesPainter.cpp \ Index: kivio/kiviopart/ui/gridsetupdialogbase.ui =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/kivio/kiviopart/ui/gridsetupdialogbase.ui,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -b -u -r1.1.1.4 -r1.2 Index: kivio/plugins/kivioconnectortool/straight_connector/Makefile.am =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -b -u -r1.1.1.2 -r1.2 --- kivio/plugins/kivioconnectortool/straight_connector/Makefile.am 20 Jun 2002 04:50:13 -0000 1.1.1.2 +++ kivio/plugins/kivioconnectortool/straight_connector/Makefile.am 20 Jun 2002 04:48:28 -0000 1.2 @@ -3,6 +3,7 @@ #### WARNING! All changes made in this part will be lost! #### ############################################################## +libdir = $(kde_datadir)/kivio/autoloadStencils lib_LTLIBRARIES =libstraight_connector.la @@ -30,14 +31,14 @@ ## This is a very bad hack..... why is this needed ? (David) -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) - $(LIBTOOL) --mode=install $(INSTALL) ./.libs/libstraight_connector.so $(DESTDIR)$(libdir)/straight_connector.ksp; - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/straight_connector.ksp; +#install-libLTLIBRARIES: $(lib_LTLIBRARIES) +# @$(NORMAL_INSTALL) +# $(mkinstalldirs) $(DESTDIR)$(libdir) +# $(LIBTOOL) --mode=install $(INSTALL) ./.libs/libstraight_connector.dylib $(DESTDIR)$(libdir)/straight_connector.ksp; +# +#uninstall-libLTLIBRARIES: +# @$(NORMAL_UNINSTALL) +# $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/straight_connector.ksp; stencil_DATA = straight_connector.xpm stencildir = $(kde_datadir)/kivio/autoloadStencils Index: kpresenter/kpresenter_view.cc =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/kpresenter/kpresenter_view.cc,v retrieving revision 1.1.1.4 retrieving revision 1.4 diff -u -b -u -r1.1.1.4 -r1.4 --- kpresenter/kpresenter_view.cc 12 Sep 2002 12:45:08 -0000 1.1.1.4 +++ kpresenter/kpresenter_view.cc 12 Sep 2002 12:53:52 -0000 1.4 @@ -4451,7 +4451,7 @@ //(Laurent) deselect object when we change page. //otherwise you can change object properties on other page m_canvas->deSelectAllObj(); - m_pKPresenterDoc->repaint( FALSE ); + m_pKPresenterDoc->repaint( (bool)FALSE ); m_pKPresenterDoc->displayActivePage(m_pKPresenterDoc->pageList().at(currPg)); Index: kspread/plugins/calculator/kcalc_core.cpp =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/kspread/plugins/calculator/kcalc_core.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -b -u -r1.1.1.1 -r1.2 --- kspread/plugins/calculator/kcalc_core.cpp 20 Jun 2002 04:43:37 -0000 1.1.1.1 +++ kspread/plugins/calculator/kcalc_core.cpp 11 Aug 2002 16:42:11 -0000 1.2 @@ -51,7 +51,7 @@ #undef HAVE_LONG_DOUBLE #endif -#ifndef HAVE_FUNC_ISINF +#if !defined(HAVE_FUNC_ISINF) || defined(__APPLE__) #ifdef HAVE_IEEEFP_H #include <ieeefp.h> #else Index: kugar/part/Makefile.am =================================================================== RCS file: /cvs/od/proj/KDE-Darwin/koffice/kugar/part/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -b -u -r1.1.1.1 -r1.2 --- kugar/part/Makefile.am 20 Jun 2002 04:43:38 -0000 1.1.1.1 +++ kugar/part/Makefile.am 20 Jun 2002 04:48:29 -0000 1.2 @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libkugarpart.la libkugarpart_la_SOURCES = kugar_part.cpp libkugarpart_la_LDFLAGS = $(all_libraries) -module -avoid-version -libkugarpart_la_LIBADD = ../lib/libkugar.la $(LIB_KPARTS) $(LIB_KDEPRINT) +libkugarpart_la_LIBADD = ../lib/libkugar.la $(LIB_KPARTS) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkugarpart_la_METASOURCES = AUTO --- koffice-1.2rc1-2.info DELETED --- --- koffice-1.2rc1-2.patch DELETED --- |