Page MenuHomeFreeBSD
Files F149320793

D46807.id143841.diff
No OneTemporary
Actions

D46807.id143841.diff
View Options

diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -12,8 +12,8 @@
# There is bug in python bindings Makefile
MAKE_JOBS_UNSAFE=yes
-PORTREVISION_LATEST= 4
-PORTREVISION_LTS= 2
+PORTREVISION_LATEST= 5
+PORTREVISION_LTS= 3
SVN_BUILD_BINDINGS= yes
diff --git a/devel/py-subversion/files/patch-eae531008b3454d2709b8aaf766b08e37160668a b/devel/py-subversion/files/patch-eae531008b3454d2709b8aaf766b08e37160668a
new file mode 100644
--- /dev/null
+++ b/devel/py-subversion/files/patch-eae531008b3454d2709b8aaf766b08e37160668a
@@ -0,0 +1,44 @@
+--- subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c.orig 2023-10-20 04:00:04 UTC
++++ subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
+@@ -2321,8 +2321,6 @@ static svn_error_t *apply_textdelta(void *file_baton,
+ in Python. */
+ if (result == Py_None)
+ {
+- Py_DECREF(result);
+-
+ *handler = svn_delta_noop_window_handler;
+ *h_baton = NULL;
+ }
+@@ -2839,8 +2837,7 @@ parse_fn3_apply_textdelta(svn_txdelta_window_handler_t
+ {
+ PyObject *editor = NULL, *baton_item = NULL, *py_pool = NULL;
+ PyObject *ib = node_baton;
+- apr_pool_t *pool;
+- PyObject *result;
++ PyObject *result = NULL;
+ svn_error_t *err;
+
+ svn_swig_py_acquire_py_lock();
+@@ -2863,13 +2860,12 @@ parse_fn3_apply_textdelta(svn_txdelta_window_handler_t
+ in Python. */
+ if (result == Py_None)
+ {
+- Py_DECREF(result);
+-
+ *handler = svn_delta_noop_window_handler;
+ *handler_baton = NULL;
+ }
+ else
+ {
++ apr_pool_t *pool;
+ /* return the thunk for invoking the handler. the baton creates
+ new reference of our 'result' reference, which is the handler,
+ so we release it even if no error. */
+@@ -2890,6 +2886,7 @@ parse_fn3_apply_textdelta(svn_txdelta_window_handler_t
+ err = SVN_NO_ERROR;
+
+ finished:
++ Py_XDECREF(result);
+ svn_swig_py_release_py_lock();
+ return err;
+ }

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 24, 5:44 PM (4 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30217012
Default Alt Text
D46807.id143841.diff (2 KB)

Event Timeline