ports/156302: devel/subversion fails to build with KDE_KWALLET and KDE3 installed

[Axel Gonzalez]

>Number:         156302
>Category:       ports
>Synopsis:       devel/subversion fails to build with KDE_KWALLET and KDE3 installed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 10 02:10:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Axel Gonzalez
>Release:        8.2-RELEASE
>Organization:
>Environment:
FreeBSD moonlight 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Sat Feb 26 19:25:52 CST 2011     toor at moonlight:/z/x/tmp/obj/usr/src/sys/LXCORE82  i386

>Description:


===>  Extracting for subversion-1.6.16_1
...
...
checking for kde4-config... yes
checking for KWallet... no
configure: error: cannot find KWallet


The problem is subversion tries to use the kde3 libs.
>How-To-Repeat:
Install kde3
Select KDE_KWALLET from subversion
Build
>Fix:
This patches change the order of the search for libraries, so it looks first for kde4

The first is a patch to the current patch (patch-configure)
The second is a new patch (patch-Makefile_in)


----------------

diff patch-configure files/patch-configure

31a45,57
> @@ -22490,10 +22490,10 @@
>                    SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
>                    qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
>                    SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
> -                  CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
> +                  CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS"
>                    LIBS="$LIBS $SVN_KWALLET_LIBS"
>                    qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
> -                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
> +                  LDFLAGS="$qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix` $old_LDFLAGS"
>                    ac_ext=cpp
>  ac_cpp='$CXXCPP $CPPFLAGS'
>  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'



-------------------

# cat files/patch-Makefile_in



--- Makefile.in.orig    2011-04-09 19:14:28.673543001 -0500
+++ Makefile.in 2011-04-09 19:15:31.740545978 -0500
@@ -110,8 +110,9 @@
 LT_CXX_LIBADD = @LT_CXX_LIBADD@
 
 INCLUDES = -I$(top_srcdir)/subversion/include -I$(top_builddir)/subversion \
+           @SVN_KWALLET_INCLUDES@ \
            @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ @SVN_APR_MEMCACHE_INCLUDES@ \
-           @SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ @SVN_KWALLET_INCLUDES@ \
+           @SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ \
            @SVN_NEON_INCLUDES@ @SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ \
            @SVN_SQLITE_INCLUDES@ @SVN_ZLIB_INCLUDES@

>Release-Note:
>Audit-Trail:
>Unformatted: