swig: synchronize pathtools

Signed-off-by: Christoph Reiter <reiter.christoph@gmail.com>

mingw-w64-swig/PKGBUILD

@@ -4,7 +4,7 @@ _realname=swig
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Generate scripting interfaces to C/C++ code (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -22,8 +22,8 @@ source=(https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.ta
         001-relocate.patch
         002-fix-python-find.patch)
 sha256sums=('2af08aced8fcd65cdb5cc62426768914bedc735b1c250325203716f78e39ac9b'
-            '703cd0cb74e714f9e66d26de11c109dd76fab07e723af8dde56a35ea65102e5f'
-            '4f9d325265ef6f4e90ad637dea41afa6995388c921fe961ad5dc895aca10318b'
+            '08209cbf1633fa92eae7e5d28f95f8df9d6184cc20fa878c99aec4709bb257fd'
+            '965d3921ec4fdeec94a2718bc2c85ce5e1a00ea0e499330a554074a7ae15dfc6'
             '7239de790c573d82bd7ef9aa46afd99c5b078f82dc5093f697e80693bdc026b3'
             '057f0a306aee0d28a5bb6538b569c650e47c05b9848c9477cdeb7bb8c792944d')
 

mingw-w64-swig/pathtools.c

@@ -263,17 +263,6 @@ simplify_path(char * path)
   *result_p = '\0';
 }
 
-/* Returns actual_to by calculating the relative path from -> to and
-   applying that to actual_from. An assumption that actual_from is a
-   dir is made, and it may or may not end with a '/' */
-char const *
-get_relocated_path (char const * from, char const * to, char const * actual_from)
-{
-  char const * relative_from_to = get_relative_path (from, to);
-  char * actual_to = (char *) malloc (strlen(actual_from) + 2 + strlen(relative_from_to));
-  return actual_to;
-}
-
 int
 get_executable_path(char const * argv0, char * result, ssize_t max_size)
 {
@@ -509,6 +498,7 @@ get_relocated_path_list_ref(char const * from, char const * to_path_list, char *
     arr[i] = scratch;
     strcat (scratch, ref_path);
     strcat (scratch, rel_to_datadir);
+    free (rel_to_datadir);
     simplify_path (arr[i]);
     size_t arr_i_size = strlen (arr[i]);
     result_size += arr_i_size;
@@ -564,6 +554,7 @@ single_path_relocation_ref(const char *from, const char *to, char *ref_path)
   }
   char * rel_to_datadir = get_relative_path (from, to);
   strcat (ref_path, rel_to_datadir);
+  free (rel_to_datadir);
   simplify_path (&ref_path[0]);
   return malloc_copy_string(ref_path);
 #else

mingw-w64-swig/pathtools.h

@@ -48,7 +48,6 @@ strip_n_prefix_folders(char const * path, size_t n);
 void
 strip_n_suffix_folders(char * path, size_t n);
 
-char const * get_relocated_path (char const * from, char const * to, char const * actual_from);
 char * get_relocated_path_list(char const * from, char const * to_path_list);
 char * get_relocated_path_list_lib(char const * from, char const * to_path_list);