Bug 156302
| Summary: | devel/subversion fails to build with KDE_KWALLET and KDE3 installed | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Axel Gonzalez <loox> | ||||
| Component: | Individual Port(s) | Assignee: | Alberto Villa <avilla> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
Responsible Changed From-To: freebsd-ports-bugs->lev Over to maintainer (via the GNATS Auto Assign Tool) avilla 2011-04-11 00:04:08 UTC
FreeBSD ports repository
Modified files:
devel/subversion Makefile.common
devel/subversion/files patch-configure
devel/subversion-freebsd Makefile
Added files:
devel/subversion/files patch-Makefile.in
Log:
- Add dependency on kdebase4-runtime when KWallet support is built.
- Fix build with KDE_WALLET when KDE 3 is installed. [1]
- Bump PORTREVISION.
This completes my previous commit and fixes KDE_WALLET option.
PR: 156302 [1]
Submitted by: Axel Gonzalez <loox@e-shell.net> [1]
Approved by: lev (maintainer, implicit)
Revision Changes Path
1.142 +1 -1 ports/devel/subversion-freebsd/Makefile
1.44 +3 -3 ports/devel/subversion/Makefile.common
1.1 +13 -0 ports/devel/subversion/files/patch-Makefile.in (new)
1.19 +15 -2 ports/devel/subversion/files/patch-configure
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Responsible Changed From-To: lev->avilla i'll take it as it refers to the kwallet support i committed recently State Changed From-To: open->closed Committed. Thanks! |
===> 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. 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 How-To-Repeat: Install kde3 Select KDE_KWALLET from subversion Build