Update of /cvsroot/fink/experimental/rangerrick/finkinfo/kde
In directory usw-pr-cvs1:/tmp/cvs-serv1284
Added Files:
kdevelop-2.1.3-4.info kdevelop-2.1.3-4.patch
kio-kmd-0.2-3.info kio-kmd-0.2-3.patch
mosfet-liquid-0.9.5-6.info mosfet-liquid-0.9.5-6.patch
Removed Files:
kdevelop-2.1.3-3.info kdevelop-2.1.3-3.patch
kio-kmd-0.2-2.info kio-kmd-0.2-2.patch
mosfet-liquid-0.9.5-5.info mosfet-liquid-0.9.5-5.patch
Log Message:
whups, these versions are updated
--- NEW FILE: kdevelop-2.1.3-4.info ---
Package: kdevelop
Version: 2.1.3
Revision: 4
GCC: 3.1
Depends: kdelibs3-ssl (>= 3.0.7-3) | kdelibs3 (>= 3.0.7-3), kdebase3-ssl (>= 3.0.7-3)
| kdebase3 (>= 3.0.7-3), dlcompat (>= 20020929), libjpeg-shlibs (>= 6b), libpng-shlibs
(>= 1.0.12), qt3-shlibs (>= 3.0.5.7), qt3 (>= 3.0.5.7)
Recommends: qt3-bin (>= 3.0.5.7)
BuildDepends: arts-dev (>= 1.1.0-3), kdelibs3-ssl-dev (>= 3.0.7-3) | kdelibs3-dev (>=
3.0.7-3), kdebase3-ssl-dev (>= 3.0.7-3) | kdebase3-dev (>= 3.0.7-3), automake (>=
1.6), autoconf25, libtool14, fink (>= 0.10.0), dlcompat (>= 20020929), libjpeg (>=
6b), libpng (>= 1.0.12), qt3 (>= 3.0.5.7)
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Source: http://download.kde.org/stable/3.0.3/src/%n-%v_for_KDE_3.0.tar.bz2
Source-MD5: f71ad2aa07522f99ef62bc46d2e3e8bf
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 --disable-dependency-tracking `cat /tmp/kde-build-options`
CompileScript: <<
#!/bin/sh
make -f Makefile.cvs
export KDEDIR=%p
sh configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d
rm -rf %i/bin/extractrc
<<
DocFiles: AUTHORS BUGS COPYING ChangeLog FAQ INSTALL README* TODO
Description: KDE - Development IDE
DescDetail: <<
A full integrated development environment for KDE.
<<
License: GPL/LGPL
--- NEW FILE: kdevelop-2.1.3-4.patch ---
Index: .cvsignore
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- .cvsignore 25 Jun 2002 03:29:02 -0000 1.1.1.1
+++ .cvsignore 25 Jun 2002 03:32:07 -0000 1.2
@@ -20,3 +20,4 @@
kdevelop.kdevpkdevses
*-stamp
.kdbgrc*
+autom4te.cache
Index: Makefile.cvs
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/Makefile.cvs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- Makefile.cvs 25 Jun 2002 03:29:02 -0000 1.1.1.1
+++ Makefile.cvs 25 Jun 2002 03:32:07 -0000 1.2
@@ -9,6 +9,8 @@
echo " link kde-common/admin to ./admin" ;\
exit 1 ;\
fi
+ @echo "FIXME: fixing ordering issues for OSX linker"
+ @cp kdevelop/ctoolclass.* kdevelop/setup
$(MAKE) -f admin/Makefile.common cvs
.SILENT:
Index: admin/Makefile.common
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/admin/Makefile.common,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -b -u -r1.1.1.1 -r1.3
Index: admin/acinclude.m4.in
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/admin/acinclude.m4.in,v
retrieving revision 1.1.1.2
diff -u -b -u -r1.1.1.2 acinclude.m4.in
--- admin/acinclude.m4.in 21 Aug 2002 15:17:16 -0000 1.1.1.2
+++ admin/acinclude.m4.in 25 Sep 2002 00:34:54 -0000
@@ -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
@@ -905,7 +904,7 @@
kde_ldflags_safe="$LDFLAGS"
kde_libs_safe="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS"
LIBS="-lXext -lX11 $LIBSOCKET"
AC_TRY_LINK([
@@ -947,9 +946,9 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_CFLAGS="$CFLAGS"
kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS"
CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
+LIBS="-lXinerama -lXext -lX11"
if test "x$no_xinerama" = "xno"; then
@@ -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")
@@ -2544,10 +2557,10 @@
if test $kde_use_debug_code = "full"; then
CFLAGS="-g3 $CFLAGS"
else
- CFLAGS="-g -O2 $CFLAGS"
+ CFLAGS="-g -O $CFLAGS"
fi
else
- CFLAGS="-O2 $CFLAGS"
+ CFLAGS="-Os -frename-registers -mmultiple -mcpu=750 -mtune=750 $CFLAGS"
fi
fi
@@ -2577,7 +2590,7 @@
if test "$kde_use_debug_code" = "full"; then
CXXFLAGS="-g3 $CXXFLAGS"
else
- CXXFLAGS="-g -O2 $CXXFLAGS"
+ CXXFLAGS="-g -O $CXXFLAGS"
fi
fi
KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
@@ -2589,7 +2602,7 @@
if test "$CXX" = "KCC"; then
CXXFLAGS="+K3 $CXXFLAGS"
else
- CXXFLAGS="-O2 $CXXFLAGS"
+ CXXFLAGS="-Os -frename-registers -mmultiple -mcpu=750 -mtune=750 $CXXFLAGS"
fi
fi
fi
@@ -3059,9 +3072,9 @@
ac_save_ldflags="$LDFLAGS"
ac_save_cflags="$CFLAGS"
if test "x$kde_use_qt_emb" != "xyes"; then
- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries
-lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
+ LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries
+-lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
else
- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries
-lXpm $LIBZ $LIBSOCKET"
+ LDFLAGS="$LDFLAGS $USER_LDFLAGS $X_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries
+-lXpm $LIBZ $LIBSOCKET"
fi
CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
@@ -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
@@ -4553,6 +4566,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
@@ -4604,10 +4618,20 @@
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
kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed
's,libhpi.so,,' | tail -n 1`
+ ;;
+ esac
dnl Now check everything's fine under there
dnl the include dir is our flag for having the JDK
@@ -4635,17 +4659,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/kdevelop/admin/am_edit,v
retrieving revision 1.1.1.2
retrieving revision 1.4
diff -u -b -u -r1.1.1.2 -r1.4
--- admin/am_edit 21 Aug 2002 15:17:00 -0000 1.1.1.2
+++ admin/am_edit 21 Aug 2002 15:24:55 -0000 1.4
@@ -694,7 +694,7 @@
my ($dir, $hFile, $cppFile) = split ("\035", $globalmocs{$mocFile}, 3);
if (defined ($cppFile)) {
$mocs .= " $mocFile.moc" if exists $shash{$cppFile};
- } elsif (grep(/^$mocFile\.$cppExt$/, @progsources)) {
+ } else {
$sourcelist{$cxxsuffix} .= "$mocFile.moc.$cxxsuffix ";
$moc_cpp_added = 1;
}
@@ -742,7 +742,7 @@
}
}
- $handling = "$program.all_$suffix.$suffix: \$(srcdir)/Makefile.in
$source_deps $mocs\n";
+ $handling = "$program.all_$suffix.$suffix: \$(srcdir)/Makefile.in" .
+$source_deps . " " . join(' ', $mocs) . "\n";
$handling .= "\t\@echo 'creating $program.all_$suffix.$suffix ...'; \\\n";
$handling .= "\trm -f $program.all_$suffix.files
$program.all_$suffix.final; \\\n";
$handling .= "\techo \"#define KDE_USE_FINAL 1\" >>
$program.all_$suffix.final; \\\n";
@@ -1881,7 +1881,6 @@
foreach my $mocFile (keys (%globalmocs))
{
my ($dir, $hFile, $cppFile) = split ("\035", $globalmocs{$mocFile}, 3);
-
if (defined ($cppFile))
{
$mocs .= " $mocFile.moc" if exists $shash{$cppFile};
@@ -1923,7 +1922,7 @@
$MakefileData =~ s/\034/\\\n\t/g; # Restore continuation lines
# Append our $progId line, _below_ the "generated by automake" line
# because automake-1.6 relies on the first line to be his own.
- my $progIdLine = "\# $progId - " . '$Revision: 1.339 $ '."\n";
+ my $progIdLine = "\# $progId - " . '$Revision: 1.338 $ '."\n";
if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
warn "automake line not found in $makefile\n";
# Fallback: first line
Index: admin/config.pl
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/admin/config.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -b -u -r1.1.1.1 -r1.3
Index: admin/cvs.sh
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/admin/cvs.sh,v
retrieving revision 1.1.1.2
retrieving revision 1.3
diff -u -b -u -r1.1.1.2 -r1.3
--- admin/cvs.sh 21 Aug 2002 15:17:01 -0000 1.1.1.2
+++ admin/cvs.sh 21 Aug 2002 15:24:55 -0000 1.3
@@ -255,7 +255,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.0.7\""
+ VERSION="\"3.0.6\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
Index: admin/detect-autoconf.sh
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/admin/detect-autoconf.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- admin/detect-autoconf.sh 26 Jun 2002 02:38:53 -0000 1.1.1.1
+++ admin/detect-autoconf.sh 21 Aug 2002 15:24:55 -0000 1.2
@@ -42,12 +42,12 @@
checkAutomakeAclocal ()
{
if test -z "$UNSERMAKE"; then
- if test -x "`$WHICH automake-1.5`" ; then
- AUTOMAKE="`$WHICH automake-1.5`"
- ACLOCAL="`$WHICH aclocal-1.5`"
- elif test -x "`$WHICH automake-1.6`" ; then
+ if test -x "`$WHICH automake-1.6`" ; then
AUTOMAKE="`$WHICH automake-1.6`"
ACLOCAL="`$WHICH aclocal-1.6`"
+ elif test -x "`$WHICH automake-1.5`" ; then
+ AUTOMAKE="`$WHICH automake-1.5`"
+ ACLOCAL="`$WHICH aclocal-1.5`"
fi
else
AUTOMAKE="$UNSERMAKE"
Index: admin/libtool.m4.in
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/admin/libtool.m4.in,v
retrieving revision 1.1.1.2
retrieving revision 1.4
diff -u -b -u -r1.1.1.2 -r1.4
--- admin/libtool.m4.in 21 Aug 2002 15:17:03 -0000 1.1.1.2
+++ admin/libtool.m4.in 21 Aug 2002 15:24:55 -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) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $linker_flags
+$(test x$module != xyes && echo -install_name $rpath/$soname $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/kdevelop/admin/ltmain.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.4
diff -u -b -u -r1.1.1.1 -r1.4
--- admin/ltmain.sh 26 Jun 2002 02:38:55 -0000 1.1.1.1
+++ admin/ltmain.sh 21 Aug 2002 15:24:55 -0000 1.4
@@ -3321,7 +3321,23 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
+ if test "x$verstring" = "x0.0"; then
+ tmp_verstring=
+ else
+ tmp_verstring="$verstring"
+ fi
+ 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" : ".*"` &&
@@ -3419,7 +3435,12 @@
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
+ deplibs="${deplibs%$conv*} ${deplibs#*$conv}"
+ done
eval cmds=\"$archive_cmds\"
+ deplibs="$save_deplibs"
fi
# Append the command to remove the reloadable object files
@@ -3632,6 +3653,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/kdevelop/admin/missing,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -b -u -r1.1.1.1 -r1.3
--- admin/missing 26 Jun 2002 02:38:55 -0000 1.1.1.1
+++ admin/missing 10 Jul 2002 21:08:37 -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: kdevelop/Makefile.am
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- kdevelop/Makefile.am 25 Jun 2002 03:29:08 -0000 1.1.1.1
+++ kdevelop/Makefile.am 25 Jun 2002 03:32:09 -0000 1.2
@@ -1,11 +1,11 @@
####### kdevelop will overwrite this part!!! (begin)##########
bin_PROGRAMS = kdevelop
-kdevelop_SOURCES = ccompletionopts.cpp ccompletionoptsdlg.ui simpleparser.cpp
kdevregexp.cpp cprjconfchange.cpp cprjcompoptsdlg.ui cprjcompopts.cpp
cprjaddoptsdlg.ui cprjaddopts.cpp cppcodecompletion.cpp codecompletion_arghint.cpp
ccompconf.cpp ccompconfdlg.ui ctoolclass.cpp kdevsession.cpp clibpropdlgimpl.cpp
clibpropdlg.ui ckonsolewidget.cpp docviewman.cpp ckdevelop.cpp ckdevelop_classview.cpp
ckdevelop_noslot.cpp cprjoptionsdlg.cpp ckappwizard.cpp wzconnectdlg.ui
ckdevelop_init.cpp main.cpp kstartuplogo.cpp kdevlistview.cpp grepdialog.cpp
doctreeview.cpp dbgtoolbar.cpp dbgpsdlg.cpp ctreeview.cpp ctreehandler.cpp
ctoolsconfigdlg.cpp crealfileview.cpp cproject.cpp coutputwidget.cpp cnewfiledlg.cpp
cnewclassdlg.cpp cmakemanualdlgdata.cpp cmakemanualdlg.cpp clogfileview.cpp
ckdevsetupdlg.cpp ckdevelop_whatsthis.cpp ckdevelop_project.cpp cclasstreehandler.cpp
ckdevaccel.cpp cgrouppropertiesdlg.cpp cgeneratenewfile.cpp cfinddoctextdlg.cpp
cfilepropdlg.cpp cexecuteargdlg.cpp ceditwidget.cpp cdoctreepropdlg.cpp
cdocbrowser.cpp ccvaddfolderdlg.cpp cclonefunctiondlg.cpp cclassview.cpp
wzconnectdlgimpl.cpp cclasstooltreeview.cpp cclasstooldlg.cpp
caddnewtranslationdlg.cpp caddexistingfiledlg.cpp caddclassmethoddlg.cpp
caddclassattributedlg.cpp
+kdevelop_SOURCES = ccompletionopts.cpp ccompletionoptsdlg.ui simpleparser.cpp
+kdevregexp.cpp cprjconfchange.cpp cprjcompoptsdlg.ui cprjcompopts.cpp
+cprjaddoptsdlg.ui cprjaddopts.cpp cppcodecompletion.cpp codecompletion_arghint.cpp
+ccompconf.cpp ccompconfdlg.ui kdevsession.cpp clibpropdlgimpl.cpp clibpropdlg.ui
+ckonsolewidget.cpp docviewman.cpp ckdevelop.cpp ckdevelop_classview.cpp
+ckdevelop_noslot.cpp cprjoptionsdlg.cpp ckappwizard.cpp wzconnectdlg.ui
+ckdevelop_init.cpp main.cpp kstartuplogo.cpp kdevlistview.cpp grepdialog.cpp
+doctreeview.cpp dbgtoolbar.cpp dbgpsdlg.cpp ctreeview.cpp ctreehandler.cpp
+ctoolsconfigdlg.cpp crealfileview.cpp cproject.cpp coutputwidget.cpp cnewfiledlg.cpp
+cnewclassdlg.cpp cmakemanualdlgdata.cpp cmakemanualdlg.cpp clogfileview.cpp
+ckdevsetupdlg.cpp ckdevelop_whatsthis.cpp ckdevelop_project.cpp cclasstreehandler.cpp
+ckdevaccel.cpp cgrouppropertiesdlg.cpp cgeneratenewfile.cpp cfinddoctextdlg.cpp
+cfilepropdlg.cpp cexecuteargdlg.cpp ceditwidget.cpp cdoctreepropdlg.cpp
+cdocbrowser.cpp ccvaddfolderdlg.cpp cclonefunctiondlg.cpp cclassview.cpp
+wzconnectdlgimpl.cpp cclasstooltreeview.cpp cclasstooldlg.cpp
+caddnewtranslationdlg.cpp caddexistingfiledlg.cpp caddclassmethoddlg.cpp
+caddclassattributedlg.cpp
kdevelop_LDADD = ./vc/libkdevelopvc.la ./kwrite/libkdevelopkwrite.la
./gfxview/libkdevelopgfxview.la ./dbg/libkdevelopdbg.la ./classwizard/libclasswizard.a
./kpp/libkdevelopkpp.la ./classparser/libclassparser.a ./ctags/libctags.a
./setup/libkdevelopsetup.la ./widgets/qextmdi/src/libkdevelopqextmdi.la $(LEXLIB)
$(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
SUBDIRS = classparser kpp classwizard dbg examples gfxview kwrite pics templates
tools vc widgets ctags setup
-EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp
caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h
caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h
cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h
cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h
ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h
cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h wzconnectdlgimpl.h
cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp cfilepropdlg.h
cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp cgeneratenewfile.h
cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h ckdevaccel.cpp
cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp ckdevelop_whatsthis.cpp
ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp clogfileview.h cmakemanualdlg.cpp
cmakemanualdlg.h cmakemanualdlgdata.cpp cnewclassdlg.cpp cnewclassdlg.h
cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp coutputwidget.h cprjoptionsdlg.h
cproject.cpp cproject.h crealfileview.cpp crealfileview.h ctoolsconfigdlg.cpp
ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h ctreeview.cpp ctreeview.h
dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h doctreeview.cpp
doctreeview.h extractrc grepdialog.cpp grepdialog.h kdevelop-setup.desktop
kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp kdevlistview.h
kstartuplogo.cpp kstartuplogo.h main.cpp resource.h structdef.h ckdevelop_init.cpp
wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp ckappwizard.h
cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp ckdevelop.cpp
hi16-app-kdevelop.png hi32-app-kdevelop.png hi48-app-kdevelop.png docviewman.cpp
docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui clibpropdlgimpl.cpp
clibpropdlgimpl.h kdevsession.cpp kdevsession.h ctoolclass.cpp ctoolclass.h
ccompconfdlg.ui ccompconf.h ccompconf.cpp codecompletion_arghint.h
codecompletion_arghint.cpp cppcodecompletion.cpp cppcodecompletion.h cprjaddopts.cpp
cprjaddopts.h cprjaddoptsdlg.ui cprjcompopts.cpp cprjcompopts.h cprjcompoptsdlg.ui
cprjconfchange.cpp cprjconfchange.h kdevregexp.cpp kdevregexp.h simpleparser.cpp
simpleparser.h ccompletionoptsdlg.ui ccompletionopts.cpp ccompletionopts.h tips
+EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp
+caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h
+caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h
+cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h
+cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h
+ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h
+cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h
+wzconnectdlgimpl.h cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp
+cfilepropdlg.h cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp
+cgeneratenewfile.h cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h
+ckdevaccel.cpp cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp
+ckdevelop_whatsthis.cpp ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp
+clogfileview.h cmakemanualdlg.cpp cmakemanualdlg.h cmakemanualdlgdata.cpp
+cnewclassdlg.cpp cnewclassdlg.h cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp
+coutputwidget.h cprjoptionsdlg.h cproject.cpp cproject.h crealfileview.cpp
+crealfileview.h ctoolsconfigdlg.cpp ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h
+ctreeview.cpp ctreeview.h dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h
+doctreeview.cpp doctreeview.h extractrc grepdialog.cpp grepdialog.h
+kdevelop-setup.desktop kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp
+kdevlistview.h kstartuplogo.cpp kstartuplogo.h main.cpp resource.h structdef.h
+ckdevelop_init.cpp wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp
+ckappwizard.h cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp
+ckdevelop.cpp hi16-app-kdevelop.png hi32-app-kdevelop.png hi48-app-kdevelop.png
+docviewman.cpp docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui
+clibpropdlgimpl.cpp clibpropdlgimpl.h kdevsession.cpp kdevsession.h ccompconfdlg.ui
+ccompconf.h ccompconf.cpp codecompletion_arghint.h codecompletion_arghint.cpp
+cppcodecompletion.cpp cppcodecompletion.h cprjaddopts.cpp cprjaddopts.h
+cprjaddoptsdlg.ui cprjcompopts.cpp cprjcompopts.h cprjcompoptsdlg.ui
+cprjconfchange.cpp cprjconfchange.h kdevregexp.cpp kdevregexp.h simpleparser.cpp
+simpleparser.h ccompletionoptsdlg.ui ccompletionopts.cpp ccompletionopts.h tips
####### kdevelop will overwrite this part!!! (end)############
Index: kdevelop/wzconnectdlgimpl.cpp
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/wzconnectdlgimpl.cpp,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -b -u -r1.1.1.2 -r1.2
--- kdevelop/wzconnectdlgimpl.cpp 25 Jun 2002 03:32:28 -0000 1.1.1.2
+++ kdevelop/wzconnectdlgimpl.cpp 12 Aug 2002 18:10:38 -0000 1.2
@@ -177,7 +177,7 @@
{
CParsedMethod* aMethod = new CParsedMethod();
workbuf = "const " + leVarType_2 -> text();
- std::cerr << "Adding read property..." << std::endl;
+ // std::cerr << "Adding read property..." << std::endl;
if ( workbuf.find('*') == -1 ) workbuf += '&';
aMethod -> setType( workbuf );
workbuf = "get"+leVarName_2 -> text() + "()";
@@ -213,7 +213,7 @@
else
arg += " _newVal";
workbuf += "( " + arg + ")";
- std::cerr << "write method name: " << workbuf << std::endl;
+ // std::cerr << "write method name: " << workbuf << std::endl;
aMethod -> setName( workbuf );
aMethod->setDeclaredInScope( currentClass -> path() );
aMethod->setExport( PIE_PUBLIC );
Index: kdevelop/classparser/Makefile.am
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/classparser/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- kdevelop/classparser/Makefile.am 25 Jun 2002 03:29:08 -0000 1.1.1.1
+++ kdevelop/classparser/Makefile.am 21 Aug 2002 16:13:10 -0000 1.2
@@ -14,8 +14,8 @@
####### kdevelop will overwrite this part!!! (end)############
tokenizer.cc: tokenizer.l
- $(LEX) -+ -otokenizer.cc $(srcdir)/tokenizer.l && cat tokenizer.cc | \
- sed -e "s,class istream;,#include <iostream\.h>," > tokenizer.cc.tmp && \
+ $(LEX) -+ -otokenizer.cc $(srcdir)/tokenizer.l && echo "using namespace std;"
+> tokenizer.cc.tmp \
+ && cat tokenizer.cc | sed -e "s,class istream;,#include <iostream>," >>
+tokenizer.cc.tmp && \
mv tokenizer.cc.tmp tokenizer.cc
KDE_OPTIONS = nofinal
Index: kdevelop/dbg/Makefile.am
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/dbg/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- kdevelop/dbg/Makefile.am 25 Jun 2002 03:29:09 -0000 1.1.1.1
+++ kdevelop/dbg/Makefile.am 25 Jun 2002 03:32:09 -0000 1.2
@@ -7,6 +7,7 @@
LDFLAGS =
+libkdevelopdbg_la_LIBADD = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
libkdevelopdbg_la_LDFLAGS = -version-info 2:0
Index: kdevelop/gfxview/Makefile.am
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/gfxview/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- kdevelop/gfxview/Makefile.am 25 Jun 2002 03:29:09 -0000 1.1.1.1
+++ kdevelop/gfxview/Makefile.am 25 Jun 2002 03:32:09 -0000 1.2
@@ -14,6 +14,7 @@
libkdevelopgfxview_la_SOURCES = GfxClassTreeWindow.cpp GfxClassTreeScrollView.cpp
GfxClassTree.cpp GfxClassBox.cpp
+libkdevelopgfxview_la_LIBADD = $(all_libraries) $(LIB_QT) $(LIB_KDECORE)
EXTRA_DIST = GfxClassBox.cpp GfxClassBox.h GfxClassTree.cpp GfxClassTree.h
GfxClassTreeScrollView.cpp GfxClassTreeScrollView.h GfxClassTreeWindow.cpp
GfxClassTreeWindow.h
Index: kdevelop/kpp/Makefile.am
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/kpp/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- kdevelop/kpp/Makefile.am 25 Jun 2002 03:29:09 -0000 1.1.1.1
+++ kdevelop/kpp/Makefile.am 25 Jun 2002 03:32:09 -0000 1.2
@@ -14,6 +14,7 @@
libkdevelopkpp_la_SOURCES = cdevproject.cpp projectView.ui prefView.ui kpp.cpp
cspec.cpp
+libkdevelopkpp_la_LIBADD = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+$(LIB_KIO)
EXTRA_DIST = README buildrpm.sh cspec.cpp cspec.h kpp.cpp kpp.h prefView.ui
projectView.ui template.spec cdevproject.cpp cdevproject.h template-kde.spec
template-make.spec
Index: kdevelop/kwrite/Makefile.am
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/kwrite/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -b -u -r1.1.1.1 -r1.3
--- kdevelop/kwrite/Makefile.am 25 Jun 2002 03:29:10 -0000 1.1.1.1
+++ kdevelop/kwrite/Makefile.am 26 Jun 2002 03:32:03 -0000 1.3
@@ -14,6 +14,8 @@
libkdevelopkwrite_la_SOURCES = kwview.cpp kwdoc.cpp kwdialog.cpp highlight.cpp
+libkdevelopkwrite_la_LIBADD = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+$(LIB_KIO) $(LIB_KDEPRINT)
+
SUBDIRS = pix
EXTRA_DIST = highlight.cpp highlight.h kwdialog.cpp kwdialog.h kwdoc.cpp kwdoc.h
kwview.cpp kwview.h
Index: kdevelop/setup/Makefile.am
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/setup/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- kdevelop/setup/Makefile.am 25 Jun 2002 03:29:11 -0000 1.1.1.1
+++ kdevelop/setup/Makefile.am 25 Jun 2002 03:32:09 -0000 1.2
@@ -7,14 +7,15 @@
LDFLAGS =
+libkdevelopsetup_la_LIBADD = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+$(LIB_KIO)
libkdevelopsetup_la_LDFLAGS = -version-info 2:0
libkdevelopsetup_la_METASOURCES = AUTO
-libkdevelopsetup_la_SOURCES = ckdevinstallstate.cpp wizardwelcomepage.cpp
wizarduimodepage.cpp wizardtoolscheckpage.cpp wizardqtdocpage.cpp wizardlastpage.cpp
wizardkdedocpage.cpp wizardindexdocupage.cpp wizardcreatekdedocpage.cpp
wizardchoosehlpage.cpp wizardbasepage.cpp cupdatekdedocdlg.cpp ckdevinstall.cpp
ccreatedocdatabasedlg.cpp
+libkdevelopsetup_la_SOURCES = ckdevinstallstate.cpp wizardwelcomepage.cpp
+wizarduimodepage.cpp wizardtoolscheckpage.cpp wizardqtdocpage.cpp wizardlastpage.cpp
+wizardkdedocpage.cpp wizardindexdocupage.cpp wizardcreatekdedocpage.cpp
+wizardchoosehlpage.cpp wizardbasepage.cpp cupdatekdedocdlg.cpp ckdevinstall.cpp
+ccreatedocdatabasedlg.cpp ctoolclass.cpp
-EXTRA_DIST = ccreatedocdatabasedlg.cpp ccreatedocdatabasedlg.h ckdevinstall.cpp
ckdevinstall.h cupdatekdedocdlg.cpp cupdatekdedocdlg.h wizardbasepage.cpp
wizardchoosehlpage.cpp wizardcreatekdedocpage.cpp wizardindexdocupage.cpp
wizardkdedocpage.cpp wizardlastpage.cpp wizardqtdocpage.cpp wizardtoolscheckpage.cpp
wizarduimodepage.cpp wizardwelcomepage.cpp ckdevinstallstate.cpp ckdevinstallstate.h
wizardbasepage.h wizardchoosehlpage.h wizardcreatekdedocpage.h wizardindexdocupage.h
wizardkdedocpage.h wizardlastpage.h wizardqtdocpage.h wizardtoolscheckpage.h
wizarduimodepage.h wizardwelcomepage.h
+EXTRA_DIST = ccreatedocdatabasedlg.cpp ccreatedocdatabasedlg.h ckdevinstall.cpp
+ckdevinstall.h cupdatekdedocdlg.cpp cupdatekdedocdlg.h wizardbasepage.cpp
+wizardchoosehlpage.cpp wizardcreatekdedocpage.cpp wizardindexdocupage.cpp
+wizardkdedocpage.cpp wizardlastpage.cpp wizardqtdocpage.cpp wizardtoolscheckpage.cpp
+wizarduimodepage.cpp wizardwelcomepage.cpp ckdevinstallstate.cpp ckdevinstallstate.h
+wizardbasepage.h wizardchoosehlpage.h wizardcreatekdedocpage.h wizardindexdocupage.h
+wizardkdedocpage.h wizardlastpage.h wizardqtdocpage.h wizardtoolscheckpage.h
+wizarduimodepage.h wizardwelcomepage.h ctoolclass.cpp ctoolclass.h
####### kdevelop will overwrite this part!!! (end)############
Index: kdevelop/vc/Makefile.am
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/vc/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- kdevelop/vc/Makefile.am 25 Jun 2002 03:29:12 -0000 1.1.1.1
+++ kdevelop/vc/Makefile.am 25 Jun 2002 03:32:09 -0000 1.2
@@ -14,6 +14,7 @@
libkdevelopvc_la_SOURCES = versioncontrol.cpp cvsdialog.cpp cvs.cpp commitdialog.cpp
+libkdevelopvc_la_LIBADD = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
EXTRA_DIST = commitdialog.cpp commitdialog.h cvs.cpp cvs.h cvsdialog.cpp cvsdialog.h
versioncontrol.cpp versioncontrol.h
Index: kdevelop/widgets/qextmdi/src/Makefile.am
===================================================================
RCS file: /cvs/od/proj/KDE-Darwin/kdevelop/kdevelop/widgets/qextmdi/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -u -r1.1.1.1 -r1.2
--- kdevelop/widgets/qextmdi/src/Makefile.am 25 Jun 2002 03:29:13 -0000 1.1.1.1
+++ kdevelop/widgets/qextmdi/src/Makefile.am 25 Jun 2002 03:32:09 -0000 1.2
@@ -10,7 +10,7 @@
lib_LTLIBRARIES = libkdevelopqextmdi.la
libkdevelopqextmdi_la_LDFLAGS = $(all_libraries) -version-info 2:0
-libkdevelopqextmdi_la_LIBADD = $(LIB_KDEUI) $(LIB_KPARTS)
+libkdevelopqextmdi_la_LIBADD = $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_QT)
libkdevelopqextmdi_la_SOURCES = qextmdichildarea.cpp qextmdichildfrm.cpp
qextmdichildfrmcaption.cpp qextmdichildview.cpp qextmdimainfrm.cpp qextmditaskbar.cpp
--- NEW FILE: kio-kmd-0.2-3.info ---
Package: kio-kmd
Version: 0.2
Revision: 3
GCC: 3.1
Depends: kdelibs3-ssl (>= 3.0.7-2) | kdelibs3 (>= 3.0.7-2), kdebase3-ssl (>= 3.0.7-2)
| kdebase3 (>= 3.0.7-2), dlcompat (>= 20020709), libpng-shlibs (>= 1.0.12), qt3-shlibs
(>= 3.0.5.7)
BuildDepends: 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), fink (>= 0.10.0),
automake (>= 1.6), autoconf25, libtool14, dlcompat (>= 20020709), libpng (>= 1.0.12),
qt3 (>= 3.0.5.7)
BuildDependsOnly: true
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Source: mirror:sourceforge:fink/kmd-%v.tar.gz
SourceDirectory: kmd-%v
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
NoSetCPPFLAGS: true
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 --mandir=%i/share/man --with-xinerama --enable-final
--disable-dependency-tracking `cat /tmp/kde-build-options`
CompileScript: <<
#!/bin/sh
make -f admin/Makefile.common cvs
export KDEDIR=%p
sh configure %c
make -j2
<<
InstallScript: <<
make install DESTDIR=%d
<<
Description: KIO module for running command-line utilities
DescDetail: <<
KmdSlave is a shell command KIOSlave. It effectively lets you provide the
output from any arbitrary shell command as the "input" to any KDE
application which uses the KIOSlave architecture. For example, you could use
the output of a Perl script as the input for KSpread, or display the output
from `ps auxw | grep kdeinit` in a Konqueror window.
<<
DescPort: <<
NOTE: KDE packages do *not* have an -shlibs because of KDE's use of
libltdl! The .la's *must* be used in conjunction with the dynamic
libraries, and they are unversioned filenames, so multiple -shlibs would
conflict.
<<
License: GPL
--- NEW FILE: kio-kmd-0.2-3.patch ---
diff -uNbr kmd-0.2/admin/Makefile.common kmd-0.2-new/admin/Makefile.common
--- kmd-0.2/admin/Makefile.common Sun Mar 24 10:41:11 2002
+++ kmd-0.2-new/admin/Makefile.common Tue Aug 13 05:48:28 2002
@@ -1,381 +1,34 @@
+### Makefile.common
+###
+### Copyright (C) 2002 by the KDE developers
-SHELL=/bin/sh
-
-cvs:
- if test -x /usr/bin/autoconf2.50 ; then \
- AUTOCONF="/usr/bin/autoconf2.50" ;\
- else \
- AUTOCONF="autoconf" ;\
- fi; \
- AUTOCONF_VERSION=`$$AUTOCONF --version` ;\
- if test "x$$AUTOCONF_VERSION" = "xAutoconf version 2.13"; then \
- echo "*** YOU'RE USING AUTOCONF 2.13. We suggest updating." ;\
[...10639 lines suppressed...]
esac
@@ -87,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
@@ -124,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}'.
--- NEW FILE: mosfet-liquid-0.9.5-6.info ---
Package: mosfet-liquid
Version: 0.9.5
Revision: 6
GCC: 3.1
Replaces: %n-shlibs
Depends: kdelibs3 (>= 3.0.7-2) | kdelibs3-ssl (>= 3.0.7-2), kdebase3 (>= 3.0.7-2) |
kdebase3-ssl (>= 3.0.7-2), dlcompat (>= 20020929), libpng-shlibs (>= 1.0.12),
qt3-shlibs (>= 3.0.5.7)
BuildDepends: arts-dev (>= 1.1.0-2), kdelibs3-dev (>= 3.0.7-2) | kdelibs3-ssl-dev (>=
3.0.7-2), kdebase3-dev (>= 3.0.7-2) | kdebase3-ssl-dev (>= 3.0.7-2), fink (>= 0.10.0),
automake (>= 1.6), autoconf25, libtool14, dlcompat (>= 20020929), libpng (>= 1.0.12),
qt3 (>= 3.0.5.7)
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Source: mirror:sourceforge:fink/%n%v.tar.gz
SourceDirectory: %n%v
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
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 --mandir=%i/share/man --with-xinerama --enable-final
--disable-dependency-tracking `cat /tmp/kde-build-options`
CompileScript: <<
#!/bin/sh
make -f Makefile.cvs
export KDEDIR=%p
sh configure %c
make -j2
<<
InstallScript: <<
make install DESTDIR=%d
rm -rf %i/share/apps/ksplash
<<
Description: Mosfet's "liquid" style for KDE
DescDetail: <<
This is the "liquid" Aqua-like widget style for KDE.
<<
DescPort: <<
NOTE: KDE packages do *not* have an -shlibs because of KDE's use of
libltdl! The .la's *must* be used in conjunction with the dynamic
libraries, and they are unversioned filenames, so multiple -shlibs would
conflict.
<<
License: BSD
--- NEW FILE: mosfet-liquid-0.9.5-6.patch ---
diff -uNbr mosfet-liquid0.9.5/admin/Makefile.common
mosfet-liquid0.9.5-new/admin/Makefile.common
--- mosfet-liquid0.9.5/admin/Makefile.common Mon Mar 25 19:26:16 2002
+++ mosfet-liquid0.9.5-new/admin/Makefile.common Mon Aug 12 12:44:59 2002
@@ -1,376 +1,34 @@
+### Makefile.common
+###
+### Copyright (C) 2002 by the KDE developers
-SHELL=/bin/sh
-
-cvs:
- @AUTOCONF_VERSION=`autoconf --version` ;\
- if test "x$$AUTOCONF_VERSION" = "xAutoconf version 2.13"; then \
- echo "*** YOU'RE USING AUTOCONF 2.13. We suggest updating" ;\
- echo "*** autocnf 2.52 works best for now, we will drop" ;\
- echo "*** support for autoconf 2.13 soon"; \
- test ! -f admin/libtool.m4.in || mv admin/libtool.m4.in
admin/new-libtool.m4.in ;\
- test ! -f admin/ltmain.sh || mv admin/ltmain.sh admin/new-ltmain.sh ;\
- for file in libtool.m4.in ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig
ltmain.sh; do \
[...10717 lines suppressed...]
esac
@@ -87,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
@@ -124,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}'.
--- kdevelop-2.1.3-3.info DELETED ---
--- kdevelop-2.1.3-3.patch DELETED ---
--- kio-kmd-0.2-2.info DELETED ---
--- kio-kmd-0.2-2.patch DELETED ---
--- mosfet-liquid-0.9.5-5.info DELETED ---
--- mosfet-liquid-0.9.5-5.patch DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
