libsvn_auth_gnome_keyring.pc is wrong in 1.10.0; when built against
libsecret it still references the gnome-keyring library.
...
Requires: apr-1 gnome-keyring-1
Requires.private: libsvn_subr
The dep should also be private; fix attached OK?
[[[
Fixes libsvn_auth_gnome_keyring.pc when configured with libsecret, and
make dependencies private.
* configure.in, build/ac-macros/libsecret.m4:
Set SVN_GNOME_KEYRING_PCLIBS to libsecret/gnome-keyring as appropriate.
* build.conf (gnome-keyring):
Substitute SVN_GNOME_KEYRING_PCLIBS as private deps of
libsvn_auth_gnome_keyring in generated pkg-config file.
]]]
Index: build/ac-macros/libsecret.m4
===================================================================
--- build/ac-macros/libsecret.m4 (revision 1830711)
+++ build/ac-macros/libsecret.m4 (working copy)
@@ -54,6 +54,7 @@
[Is libsecret support enabled?])
SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags libsecret-1`"
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs libsecret-1`"
+ SVN_GNOME_KEYRING_PCLIBS="libsecret-1"
found_gnome_keyring="yes"
else
if test "$with_gnome_keyring" = "yes"; then
@@ -90,4 +91,5 @@
fi
AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
AC_SUBST(SVN_GNOME_KEYRING_LIBS)
+ AC_SUBST(SVN_GNOME_KEYRING_PCLIBS)
])
Index: build.conf
===================================================================
--- build.conf (revision 1830711)
+++ build.conf (working copy)
@@ -1463,7 +1463,8 @@
[gnome-keyring]
type = lib
external-lib = $(SVN_GNOME_KEYRING_LIBS)
-pkg-config = gnome-keyring-1
+pkg-config = @SVN_GNOME_KEYRING_PCLIBS@
+pkg-config-private = yes
[kwallet]
type = lib
Index: configure.ac
===================================================================
--- configure.ac (revision 1830711)
+++ configure.ac (working copy)
@@ -593,6 +593,7 @@
[Is GNOME Keyring support enabled?])
CPPFLAGS="$old_CPPFLAGS"
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0
gnome-keyring-1`"
+ SVN_GNOME_KEYRING_PCLIBS="glib-2.0 gnome-keyring-1"
else
AC_MSG_RESULT([no])
if test "$with_old_gnome_keyring" = "yes"; then
