ALT Linux repos
S: | 1.14.2-alt1 |
D: | 1.4.4-alt2.3.2 |
5.0: | 1.5.4-alt3 |
4.1: | 1.4.4-alt2.1.M41.1 |
4.0: | 1.4.4-alt1 |
+updates: | 1.4.4-alt1 |
3.0: | 1.2.3-alt2 |
Group :: Development/Other
RPM: subversion
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: subversion-1.9.2-alt-kwallet-build.patch
Download
Download
diff --git a/subversion/build/ac-macros/kwallet.m4 b/subversion/build/ac-macros/kwallet.m4
--- a/subversion/build/ac-macros/kwallet.m4
+++ b/subversion/build/ac-macros/kwallet.m4
@@ -68,15 +68,16 @@
fi
done
qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
- kde_dir="`$KDE4_CONFIG --prefix`"
- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
+ kde_includes=`kde4-config --path include`
+ kde_libs=`kde4-config --path lib | sed 's|.*/usr/lib\(.*\)|-L/usr/lib\1/kde4/devel|'`
+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_includes"
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"
LIBS="$LIBS $SVN_KWALLET_LIBS"
qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
+ LDFLAGS="$old_LDFLAGS $qt_lib_dirs $kde_libs"
AC_LANG(C++)
AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <kwallet.h>