rpms/subversion/F-11 subversion-1.6.2-kwallet.patch,NONE,1.1
jorton
jorton at fedoraproject.org
Tue Jun 16 14:34:49 UTC 2009
- Previous message (by thread): rpms/gdb/F-11 gdb-6.8.50.20090302-upstream.patch, NONE, 1.1 gdb-archer.patch, 1.17, 1.18 gdb.spec, 1.351, 1.352
- Next message (by thread): rpms/gdb/devel gdb-6.8.50.20090302-upstream.patch, NONE, 1.1 gdb-archer.patch, 1.16, 1.17 gdb.spec, 1.357, 1.358
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/extras/rpms/subversion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27463
Added Files:
subversion-1.6.2-kwallet.patch
Log Message:
- add missing patch.
subversion-1.6.2-kwallet.patch:
--- NEW FILE subversion-1.6.2-kwallet.patch ---
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.6.2/build/ac-macros/kwallet.m4.kwallet
+++ subversion-1.6.2/build/ac-macros/kwallet.m4
@@ -45,14 +45,14 @@ AC_DEFUN(SVN_LIB_KWALLET,
CPPFLAGS="$CPPFLAGS $d"
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`"
- LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
+ LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L/usr/lib`$kde4_config --libsuffix`/kde4/devel"
AC_LANG(C++)
AC_LINK_IFELSE([
#include <kwallet.h>
- Previous message (by thread): rpms/gdb/F-11 gdb-6.8.50.20090302-upstream.patch, NONE, 1.1 gdb-archer.patch, 1.17, 1.18 gdb.spec, 1.351, 1.352
- Next message (by thread): rpms/gdb/devel gdb-6.8.50.20090302-upstream.patch, NONE, 1.1 gdb-archer.patch, 1.16, 1.17 gdb.spec, 1.357, 1.358
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list