| 1 |
arfrever 09/03/22 02:07:58 |
| 2 |
|
| 3 |
Added: subversion-1.6.0-various_fixes.patch |
| 4 |
subversion-1.6.0-disable_linking_against_unneeded_libraries.patch |
| 5 |
Log: |
| 6 |
Version bump. Delete .packlist files (bug #221179). |
| 7 |
(Portage version: 13139-svn/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/subversion/files/subversion-1.6.0-various_fixes.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/subversion-1.6.0-various_fixes.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/subversion-1.6.0-various_fixes.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: subversion-1.6.0-various_fixes.patch |
| 16 |
=================================================================== |
| 17 |
https://svn.collab.net/viewvc/svn?view=revision&revision=36252 |
| 18 |
https://svn.collab.net/viewvc/svn?view=revision&revision=36253 |
| 19 |
https://svn.collab.net/viewvc/svn?view=revision&revision=36302 |
| 20 |
https://svn.collab.net/viewvc/svn?view=revision&revision=36686 |
| 21 |
|
| 22 |
--- subversion/libsvn_client/merge.c |
| 23 |
+++ subversion/libsvn_client/merge.c |
| 24 |
@@ -7948,7 +7948,7 @@ |
| 25 |
svn_opt_revision_t working_rev; |
| 26 |
svn_ra_session_t *ra_session; |
| 27 |
apr_pool_t *sesspool; |
| 28 |
- svn_boolean_t use_sleep; |
| 29 |
+ svn_boolean_t use_sleep = FALSE; |
| 30 |
svn_error_t *err; |
| 31 |
svn_boolean_t same_repos; |
| 32 |
|
| 33 |
--- subversion/libsvn_wc/crop.c |
| 34 |
+++ subversion/libsvn_wc/crop.c |
| 35 |
@@ -284,8 +284,9 @@ |
| 36 |
{ |
| 37 |
svn_wc_entry_t *target_entry; |
| 38 |
apr_hash_t *parent_entries; |
| 39 |
+ |
| 40 |
SVN_ERR(svn_wc_entries_read(&parent_entries, p_access, |
| 41 |
- FALSE, pool)); |
| 42 |
+ TRUE, pool)); |
| 43 |
|
| 44 |
target_entry = apr_hash_get(parent_entries, |
| 45 |
svn_path_basename(full_path, pool), |
| 46 |
--- subversion/libsvn_wc/log.c |
| 47 |
+++ subversion/libsvn_wc/log.c |
| 48 |
@@ -1472,7 +1472,7 @@ |
| 49 |
_("Invalid 'format' attribute")); |
| 50 |
|
| 51 |
/* Remove the .svn/format file, if it exists. */ |
| 52 |
- SVN_ERR(svn_io_remove_file(path, loggy->pool)); |
| 53 |
+ svn_error_clear(svn_io_remove_file(path, loggy->pool)); |
| 54 |
|
| 55 |
/* The nice thing is that, just by setting this flag, the entries file will |
| 56 |
be rewritten in the desired format. */ |
| 57 |
--- subversion/libsvn_wc/questions.c |
| 58 |
+++ subversion/libsvn_wc/questions.c |
| 59 |
@@ -78,6 +78,10 @@ |
| 60 |
|
| 61 |
svn_error_clear(err); |
| 62 |
|
| 63 |
+ /* If the format file does not exist or path not directory, then for |
| 64 |
+ our purposes this is not a working copy, so return 0. */ |
| 65 |
+ *wc_format = 0; |
| 66 |
+ |
| 67 |
/* Check path itself exists. */ |
| 68 |
SVN_ERR(svn_io_check_path(path, &kind, pool)); |
| 69 |
|
| 70 |
@@ -88,9 +92,6 @@ |
| 71 |
svn_path_local_style(path, pool)); |
| 72 |
} |
| 73 |
|
| 74 |
- /* If the format file does not exist or path not directory, then for |
| 75 |
- our purposes this is not a working copy, so return 0. */ |
| 76 |
- *wc_format = 0; |
| 77 |
} |
| 78 |
else if (err) |
| 79 |
return err; |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.1 dev-util/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch?rev=1.1&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch?rev=1.1&content-type=text/plain |
| 87 |
|
| 88 |
Index: subversion-1.6.0-disable_linking_against_unneeded_libraries.patch |
| 89 |
=================================================================== |
| 90 |
--- Makefile.in |
| 91 |
+++ Makefile.in |
| 92 |
@@ -47,6 +47,7 @@ |
| 93 |
SVN_SASL_LIBS = @SVN_SASL_LIBS@ |
| 94 |
SVN_SERF_LIBS = @SVN_SERF_LIBS@ |
| 95 |
SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@ |
| 96 |
+SVN_XML_LIBS = -lexpat |
| 97 |
SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ |
| 98 |
|
| 99 |
LIBS = @LIBS@ |
| 100 |
--- build/ac-macros/aprutil.m4 |
| 101 |
+++ build/ac-macros/aprutil.m4 |
| 102 |
@@ -77,16 +77,14 @@ |
| 103 |
AC_MSG_ERROR([apu-config --prefix failed]) |
| 104 |
fi |
| 105 |
|
| 106 |
- dnl When APR stores the dependent libs in the .la file, we don't need |
| 107 |
- dnl --libs. |
| 108 |
- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" |
| 109 |
+ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`" |
| 110 |
if test $? -ne 0; then |
| 111 |
- AC_MSG_ERROR([apu-config --link-libtool --libs failed]) |
| 112 |
+ AC_MSG_ERROR([apu-config --link-libtool failed]) |
| 113 |
fi |
| 114 |
|
| 115 |
- SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`" |
| 116 |
+ SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`" |
| 117 |
if test $? -ne 0; then |
| 118 |
- AC_MSG_ERROR([apu-config --link-ld --libs failed]) |
| 119 |
+ AC_MSG_ERROR([apu-config --link-ld failed]) |
| 120 |
fi |
| 121 |
|
| 122 |
AC_SUBST(SVN_APRUTIL_INCLUDES) |
| 123 |
--- build/ac-macros/apr.m4 |
| 124 |
+++ build/ac-macros/apr.m4 |
| 125 |
@@ -74,16 +74,14 @@ |
| 126 |
AC_MSG_ERROR([apr-config --prefix failed]) |
| 127 |
fi |
| 128 |
|
| 129 |
- dnl When APR stores the dependent libs in the .la file, we don't need |
| 130 |
- dnl --libs. |
| 131 |
- SVN_APR_LIBS="`$apr_config --link-libtool --libs`" |
| 132 |
+ SVN_APR_LIBS="`$apr_config --link-libtool`" |
| 133 |
if test $? -ne 0; then |
| 134 |
- AC_MSG_ERROR([apr-config --link-libtool --libs failed]) |
| 135 |
+ AC_MSG_ERROR([apr-config --link-libtool failed]) |
| 136 |
fi |
| 137 |
|
| 138 |
- SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`" |
| 139 |
+ SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`" |
| 140 |
if test $? -ne 0; then |
| 141 |
- AC_MSG_ERROR([apr-config --link-ld --libs failed]) |
| 142 |
+ AC_MSG_ERROR([apr-config --link-ld failed]) |
| 143 |
fi |
| 144 |
|
| 145 |
SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`" |
Archives