[SVN-4783] KWallet assumes KDE5 when Qt5 present

• Type: Bug
• Status: Open
• Priority: Minor
• Resolution: Unresolved
• Affects Version/s: 1.10.x
• Component/s: packaging

Environment

CentOS 7

• Assignee: Unassigned
• Reporter: Satya Mishra
• Created: 30/Oct/18 14:33
• Updated: 05/Sep/19 00:06

Description

The test for kwallet assumes KDE5 when Qt5 present, but that is not necessarily the case. For example CentOS7 has KDE4 and Qt5. The correct test should test for kf5-config in addition to Qt5. The below patch works for me.

--- subversion-1.10.3/build/ac-macros/kwallet.m4        2018-10-24 11:50:47.000000000 -0700
+++ subversion-1.10.3/build/ac-macros/kwallet.m4    2018-10-24 11:55:37.000000000 -0700
@@ -45,7 +45,7 @@
           if test -n "$PKG_CONFIG"; then
             if test "$HAVE_DBUS" = "yes"; then
               AC_MSG_CHECKING([for Qt])
-              if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then
+              if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui && test -x /usr/bin/kf5-config; then
                 AC_MSG_RESULT([yes, Qt5])
                 qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui"
                 kde_config_name="kf5-config"

Issue Links

• Blocked: SVN-4671 KDE KWallet 5 support