You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2018/07/13 04:00:07 UTC
svn commit: r1835781 - in /subversion/branches/1.10.x: ./ STATUS build.conf
build/ac-macros/libsecret.m4 configure.ac
Author: svn-role
Date: Fri Jul 13 04:00:07 2018
New Revision: 1835781
URL: http://svn.apache.org/viewvc?rev=1835781&view=rev
Log:
Merge r1830882 from trunk:
* r1830882
Fix libsvn_auth_gnome_keyring.pc when built using libsecret.
Justification:
The generated .pc file references files libgnome-keyring, which
is not used and may not exist.
Votes:
+1: jorton, stsp, jamessan
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/build.conf
subversion/branches/1.10.x/build/ac-macros/libsecret.m4
subversion/branches/1.10.x/configure.ac
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 13 04:00:07 2018
@@ -101,4 +101,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833621,1833836,1833842
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833621,1833836,1833842
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1835781&r1=1835780&r2=1835781&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Jul 13 04:00:07 2018
@@ -63,14 +63,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1830882
- Fix libsvn_auth_gnome_keyring.pc when built using libsecret.
- Justification:
- The generated .pc file references files libgnome-keyring, which
- is not used and may not exist.
- Votes:
- +1: jorton, stsp, jamessan
-
* r1835760
Fix segfault in the gnome keyring password provider (libsecret version).
Justification:
@@ -78,4 +70,3 @@ Approved changes:
stack variable.
Votes:
+1: danielsh, philip, jamessan
-
Modified: subversion/branches/1.10.x/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/build.conf?rev=1835781&r1=1835780&r2=1835781&view=diff
==============================================================================
--- subversion/branches/1.10.x/build.conf (original)
+++ subversion/branches/1.10.x/build.conf Fri Jul 13 04:00:07 2018
@@ -1463,7 +1463,8 @@ external-lib = $(SVN_DB_LIBS)
[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
Modified: subversion/branches/1.10.x/build/ac-macros/libsecret.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/ac-macros/libsecret.m4?rev=1835781&r1=1835780&r2=1835781&view=diff
==============================================================================
--- subversion/branches/1.10.x/build/ac-macros/libsecret.m4 (original)
+++ subversion/branches/1.10.x/build/ac-macros/libsecret.m4 Fri Jul 13 04:00:07 2018
@@ -54,6 +54,7 @@ AC_DEFUN(SVN_LIB_SECRET,
[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 @@ AC_DEFUN(SVN_LIB_SECRET,
fi
AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
AC_SUBST(SVN_GNOME_KEYRING_LIBS)
+ AC_SUBST(SVN_GNOME_KEYRING_PCLIBS)
])
Modified: subversion/branches/1.10.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/configure.ac?rev=1835781&r1=1835780&r2=1835781&view=diff
==============================================================================
--- subversion/branches/1.10.x/configure.ac (original)
+++ subversion/branches/1.10.x/configure.ac Fri Jul 13 04:00:07 2018
@@ -593,6 +593,7 @@ if test "$with_old_gnome_keyring" != "no
[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