diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-05-12 09:29:46 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-05-12 09:29:46 +0200 |
| commit | 26fddacdc05fa5b660b3e9f425173e7ae294b48f (patch) | |
| tree | 3a2e3ebbd6de7dc462ec4700fbf183631bb84a43 /subversion-1.7.0-kwallet.patch | |
subversion: import from rawhide
Diffstat (limited to 'subversion-1.7.0-kwallet.patch')
| -rw-r--r-- | subversion-1.7.0-kwallet.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/subversion-1.7.0-kwallet.patch b/subversion-1.7.0-kwallet.patch new file mode 100644 index 0000000..624641e --- /dev/null +++ b/subversion-1.7.0-kwallet.patch @@ -0,0 +1,26 @@ + +The first half of this is certainly upstream-worthy, but the second half is presumably +some Fedora-specific KDE packaging thing. It's not obvious how to get +kde4-config to report the directory which contains the .so files. + +--- subversion-1.7.0/build/ac-macros/kwallet.m4.kwallet 2010-11-01 19:29:16.000000000 +0000 ++++ subversion-1.7.0/build/ac-macros/kwallet.m4 2011-10-12 09:32:55.129561537 +0100 +@@ -64,15 +64,14 @@ AC_DEFUN(SVN_LIB_KWALLET, + 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_include_dirs="-I`$KDE4_CONFIG --path include`" ++ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_include_dirs" + 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 `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs)` -L$libdir/kde4/devel" + AC_LANG(C++) + AC_LINK_IFELSE([AC_LANG_SOURCE([[ + #include <kwallet.h> |