[
https://issues.apache.org/jira/browse/SVN-4783?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Branko Čibej updated SVN-4783:
------------------------------
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.
{noformat}
--- 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"
{noformat}
was:
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"
> KWallet assumes KDE5 when Qt5 present
> -------------------------------------
>
> Key: SVN-4783
> URL: https://issues.apache.org/jira/browse/SVN-4783
> Project: Subversion
> Issue Type: Bug
> Components: packaging
> Affects Versions: 1.10.x
> Environment: CentOS 7
> Reporter: Satya Mishra
> Priority: Minor
>
> 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.
> {noformat}
> --- 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"
> {noformat}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
