tags 490351 + patch thanks [Lucas Nussbaum] > > /usr/bin/ld: cannot find -lsvn_ra_dav-1 > > collect2: ld returned 1 exit status
ra_dav has been renamed to ra_neon, but nobody except subversion internals should ever link to it. Instead you get its functionality by linking to libsvn_ra-1. I raised a concern on upstream's dev list a few months ago about the disappearance of ra_dav, but assumed it would not affect Debian since we try not to link to libraries we don't need. I'm attaching an edited version of the patch I already posted to #483996 (basically the same issue) covering this bug as well. -- Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
diff -urN a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -249,55 +249,6 @@
##
-# check for neon
-#
-AC_MSG_CHECKING([for neon])
-AC_ARG_WITH(
- [neon],
- AC_HELP_STRING([--with-neon=DIR],[path to neon installation]),
- [
- neon_path=$withval
- with_neon="yes"
- ],[
- with_neon="no"
- ]
-)
-
-if test x$with_neon = xyes; then
- NEON_INCLUDES="-I$neon_path/include"
- NEON_LIBS="`$neon_path/bin/neon-config --libs`"
-else
- NEON_INCLUDES=""
- NEON_LIBS=""
-fi
-
-CPPFLAGS="$NEON_INCLUDES"
-
-AC_LANG(C++)
-AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM(
- [[#include <neon/ne_socket.h>]],
- [[ne_sock_exit()]]
- ),
- [
- AC_MSG_RESULT([yes])
- AC_MSG_RESULT([ headers $NEON_INCLUDES])
- AC_MSG_RESULT([ libraries $NEON_LIBS])
- ],[
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([try setting --with-neon])
- ]
-)
-
-AC_SUBST(NEON_INCLUDES)
-AC_SUBST(NEON_LIBS)
-#
-# end check for neon
-##
-
-
-
-##
# check for openssl
#
AC_MSG_CHECKING([for openssl])
diff -urN a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@
Maintainer: Andreas Fester <[EMAIL PROTECTED]>
Uploaders: Loic Minier <[EMAIL PROTECTED]>
Build-Depends: debhelper (>> 5.0.0), dpatch, libqt3-mt-dev (>> 3.3),
- libboost-dev, libapr1-dev, libdb4.6-dev, libsvn-dev, libneon27-dev,
+ libboost-dev, libapr1-dev, libdb4.6-dev, libsvn-dev,
libssl-dev, xsltproc, docbook-xsl, autotools-dev, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
diff -urN a/subcommander/Makefile.am b/subcommander/Makefile.am
--- a/subcommander/Makefile.am
+++ b/subcommander/Makefile.am
@@ -39,16 +39,15 @@
## by apr_time_from_sec
AM_CPPFLAGS = -DQT_THREAD_SUPPORT @APR_CPPFLAGS@ @STLPORT_INCLUDES@ -I.. @QT_INCLUDES@ \
- @SVN_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@ @NEON_INCLUDES@ \
+ @SVN_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@ \
@SSL_INCLUDES@ @BOOST_INCLUDES@ -D__STDC_CONSTANT_MACROS=1
bin_PROGRAMS = subcommander
subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib @QT_LIBS@ \
-lz @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_client-1 -lsvn_subr-1 \
- -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 -lsvn_ra_dav-1 \
- -lsvn_ra_local-1 -lsvn_ra_svn-1 -lsvn_repos-1 -lsvn_fs-1 \
- -lsvn_fs_fs-1 @STLPORT_LIBS@ @NEON_LIBS@
+ -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 \
+ -lsvn_repos-1 -lsvn_fs-1 @STLPORT_LIBS@
subcommander_DEPENDENCIES = ../sublib/libsublib.a ../svn/libsvn.a ../util/libutil.a
diff -urN a/subcommander/subcommander.cpp b/subcommander/subcommander.cpp
--- a/subcommander/subcommander.cpp
+++ b/subcommander/subcommander.cpp
@@ -26,15 +26,11 @@
#include <qapplication.h>
#include <qstylefactory.h>
-// neon
-#include <neon/ne_socket.h>
-#include <neon/ne_utils.h>
-
// openssl
#include <openssl/evp.h>
#include <openssl/err.h>
-// cleanup neon/ssl stuff to avoid a lot of noise when running with
+// cleanup ssl stuff to avoid a lot of noise when running with
// memory leak detection.
void exit_ssl()
@@ -47,11 +43,6 @@
ERR_free_strings();
}
-void exit_neon()
-{
- ne_sock_exit();
-}
-
int main( int argc, char* argv[] )
@@ -95,9 +86,6 @@
#if !defined(Q_WS_X11)
QApplication::setStyle( new MacStyle() );
#endif // Q_WS_X11
-
- // about dialog
- setNeonVersion( ne_version_string() );
}
catch( sc::Exception& e )
{
@@ -146,7 +134,6 @@
config.save();
exit_ssl();
- exit_neon();
TargetRepository::teardown();
stopStackProcess();
diff -urN a/sublib/AboutDialog.cpp b/sublib/AboutDialog.cpp
--- a/sublib/AboutDialog.cpp
+++ b/sublib/AboutDialog.cpp
@@ -277,20 +277,6 @@
#endif
"<tr><td align=center valign=bottom colspan=2> * * * </td></tr>";
- if( getLongAppName() == "subcommander" )
- {
- about2 +=
- "<tr>"
- "<td align=right>";
- about2 += getNeonVersion();
- about2 +=
- "</td>"
- "<td align=left>" "http://www.webdav.org"; "</td>"
- "</tr>"
- "<tr><td align=center valign=bottom colspan=2> * * * </td></tr>";
- }
-
-
about2 +=
"<tr>"
"<td align=right>";
diff -urN a/sublib/Utility.cpp b/sublib/Utility.cpp
--- a/sublib/Utility.cpp
+++ b/sublib/Utility.cpp
@@ -201,15 +201,3 @@
// Sun Aug 27 16:32:54 2006
return _q("ddd MMM dd hh:mm:ss yyyy");
}
-
-static const char* neon_version = "";
-
-void setNeonVersion( const char* v )
-{
- neon_version = v;
-}
-
-QString getNeonVersion()
-{
- return QString(neon_version).left(12);
-}
diff -urN a/sublib/Utility.h b/sublib/Utility.h
--- a/sublib/Utility.h
+++ b/sublib/Utility.h
@@ -33,7 +33,4 @@
QString getDateFormat();
-void setNeonVersion( const char* v );
-QString getNeonVersion();
-
#endif // _SC_UTILITY_H
signature.asc
Description: Digital signature
