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 2014/01/06 05:04:07 UTC
svn commit: r1555654 - in /subversion/branches/1.8.x: ./ STATUS
subversion/bindings/swig/core.i subversion/include/svn_auth.h
Author: svn-role
Date: Mon Jan 6 04:04:07 2014
New Revision: 1555654
URL: http://svn.apache.org/r1555654
Log:
Merge r1543961 from trunk:
* r1543961
Fix SWIG bindings building on OS X out of the tarball.
Justification:
Regression since 1.8
Notes:
Test by running ./autogen.sh --release and then building bindings
on OS X. Even if you run ./autogen.sh on a Mac the issue will
still replicate.
Votes:
+1: breser, brane, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/bindings/swig/core.i
subversion/branches/1.8.x/subversion/include/svn_auth.h
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1543961
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1555654&r1=1555653&r2=1555654&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Jan 6 04:04:07 2014
@@ -277,17 +277,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1543961
- Fix SWIG bindings building on OS X out of the tarball.
- Justification:
- Regression since 1.8
- Notes:
- Test by running ./autogen.sh --release and then building bindings
- on OS X. Even if you run ./autogen.sh on a Mac the issue will
- still replicate.
- Votes:
- +1: breser, brane, stefan2
-
* r1544878, r1544895
Fix output of svn --version -v to not cut info off on linux.
Justification:
Modified: subversion/branches/1.8.x/subversion/bindings/swig/core.i
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/swig/core.i?rev=1555654&r1=1555653&r2=1555654&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/bindings/swig/core.i (original)
+++ subversion/branches/1.8.x/subversion/bindings/swig/core.i Mon Jan 6 04:04:07 2014
@@ -827,7 +827,6 @@ svn_swig_pl_set_current_pool (apr_pool_t
-#ifdef SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC
%inline %{
/* Helper function to set the gnome-keyring unlock prompt function. This
* C function accepts an auth baton, a function and a prompt baton, but
@@ -851,7 +850,6 @@ static void svn_auth_set_gnome_keyring_u
prompt_baton);
}
%}
-#endif
#if defined(SWIGPERL) || defined(SWIGRUBY)
%include svn_md5_h.swg
Modified: subversion/branches/1.8.x/subversion/include/svn_auth.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/include/svn_auth.h?rev=1555654&r1=1555653&r2=1555654&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/include/svn_auth.h (original)
+++ subversion/branches/1.8.x/subversion/include/svn_auth.h Mon Jan 6 04:04:07 2014
@@ -966,7 +966,10 @@ svn_auth_get_keychain_ssl_client_cert_pw
apr_pool_t *pool);
#endif /* DARWIN || DOXYGEN */
-#if (!defined(DARWIN) && !defined(WIN32)) || defined(DOXYGEN)
+/* Note that the gnome keyring unlock prompt related items below must be
+ * declared for all platforms in order to allow SWIG interfaces to be
+ * used regardless of the platform. */
+
/** A type of callback function for obtaining the GNOME Keyring password.
*
* In this callback, the client should ask the user for default keyring
@@ -996,7 +999,7 @@ typedef svn_error_t *(*svn_auth_gnome_ke
* @c *SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC. */
#define SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON "gnome-keyring-unlock-prompt-baton"
-
+#if (!defined(DARWIN) && !defined(WIN32)) || defined(DOXYGEN)
/**
* Get libsvn_auth_gnome_keyring version information.
*