From subversion-dev  Mon Mar 14 10:35:32 2016
From: Raphael Kubo da Costa <rakuco () FreeBSD ! org>
Date: Mon, 14 Mar 2016 10:35:32 +0000
To: subversion-dev
Subject: [PATCH] Use kde4-config for determining KDE's library and include directories.
Message-Id: <8637rtmjnv.fsf () FreeBSD ! org>
X-MARC-Message: https://marc.info/?l=subversion-dev&m=145795630623671
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--=-=-="

--=-=-=
Content-Type: text/plain

[[[
At the moment the kde4-config script is used only to determine KDE4's
prefix, and then its header and library locations are derived manually.

This is not optimal, as it assumes the libraries are always installed
into $kde_prefix/lib{64} and the headers in $kde_prefix/include. The
latter is especially problematic as the headers are often installed in a
subdirectory of include/ so they do not conflict with their KDE
Frameworks 5 counterparts.

* build/ac-macros/kwallet.m4: Use the `--install include' and `--install
  lib' kde4-config parameters to retrieve the location where KDE4's
  headers and libraries are installed, respectively.
]]]


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=kwallet-install-locations.patch
Content-Description: Proposed patch

Index: build/ac-macros/kwallet.m4
===================================================================
--- build/ac-macros/kwallet.m4	(revision 1734906)
+++ build/ac-macros/kwallet.m4	(working copy)
@@ -68,15 +68,15 @@ 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_incdir="`$KDE4_CONFIG --install include`"
+                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir"
                   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)`"
+                  kde_libdir="`$KDE4_CONFIG --install lib`"
+                  LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`"
                   AC_LANG(C++)
                   AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <kwallet.h>

--=-=-=--