unzip_dir_encoding_fix.patch

3 files changed, 45 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d6979bf6a47..65550ba6b58c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,9 @@ pkgbase = python-pyfmi
 	makedepends = python-lxml
 	makedepends = python2-lxml
 	source = https://pypi.io/packages/source/P/PyFMI/PyFMI-2.5.tar.gz
+	source = unzip_dir_encoding_fix.patch
 	sha256sums = f0485f786a40448c8ffb9e2b03a587d84cd1fe403c1056f50ab787de18f8ba0b
+	sha256sums = SKIP
 
 pkgname = python-pyfmi
 	depends = fmilib
diff --git a/PKGBUILD b/PKGBUILD
index b6ff2d83bd14..ed854b4679ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,11 +7,15 @@ url="http://www.pyfmi.org"
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('python-setuptools' 'python2-setuptools' 'fmilib' 'cython' 'cython2' 'python-assimulo' 'python2-assimulo' 'python-lxml' 'python2-lxml')
-source=("https://pypi.io/packages/source/P/PyFMI/PyFMI-${pkgver}.tar.gz")
-sha256sums=('f0485f786a40448c8ffb9e2b03a587d84cd1fe403c1056f50ab787de18f8ba0b')
+source=("https://pypi.io/packages/source/P/PyFMI/PyFMI-${pkgver}.tar.gz" unzip_dir_encoding_fix.patch)
+sha256sums=('f0485f786a40448c8ffb9e2b03a587d84cd1fe403c1056f50ab787de18f8ba0b' SKIP)
 
 prepare() {
-  rm "${srcdir}"/PyFMI-${pkgver}/src/pyfmi/*.c
+  cd "${srcdir}"/PyFMI-${pkgver}
+  rm src/pyfmi/*.c
+
+  # bug in https://github.com/modelon/PyFMI/commit/decbb8340620c13c08e2acb5c4ae52ee2008462c
+  patch -p1 -i "${srcdir}"/unzip_dir_encoding_fix.patch
 }
 
 build() {
diff --git a/unzip_dir_encoding_fix.patch b/unzip_dir_encoding_fix.patch
new file mode 100644
index 000000000000..3d4af56587f6
--- /dev/null
+++ b/unzip_dir_encoding_fix.patch
@@ -0,0 +1,36 @@
+diff --git a/src/pyfmi/fmi.pyx b/src/pyfmi/fmi.pyx
+index d30de5f..5449808 100644
+--- a/src/pyfmi/fmi.pyx
++++ b/src/pyfmi/fmi.pyx
+@@ -7894,9 +7894,9 @@ def load_fmu(fmu, path = '.', enable_logging = None, log_file_name = "", kind =
+ 
+         #Compare fmu_kind with input-specified kind
+         if fmu_1_kind == FMI_ME and kind.upper() != 'CS':
+-            model=FMUModelME1(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir)
++            model=FMUModelME1(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir))
+         elif (fmu_1_kind == FMI_CS_STANDALONE or fmu_1_kind == FMI_CS_TOOL) and kind.upper() != 'ME':
+-            model=FMUModelCS1(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir)
++            model=FMUModelCS1(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir))
+         else:
+             FMIL.fmi1_import_free(fmu_1)
+             FMIL.fmi_import_free_context(context)
+@@ -7938,15 +7938,15 @@ def load_fmu(fmu, path = '.', enable_logging = None, log_file_name = "", kind =
+         #FMU kind is known
+         if kind.lower() == 'auto':
+             if fmu_2_kind == FMIL.fmi2_fmu_kind_cs:
+-                model = FMUModelCS2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir)
++                model = FMUModelCS2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir))
+             elif fmu_2_kind == FMIL.fmi2_fmu_kind_me or fmu_2_kind == FMIL.fmi2_fmu_kind_me_and_cs:
+-                model = FMUModelME2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir)
++                model = FMUModelME2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir))
+         elif kind.upper() == 'CS':
+             if fmu_2_kind == FMIL.fmi2_fmu_kind_cs or fmu_2_kind == FMIL.fmi2_fmu_kind_me_and_cs:
+-                model = FMUModelCS2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir)
++                model = FMUModelCS2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir))
+         elif kind.upper() == 'ME':
+             if fmu_2_kind == FMIL.fmi2_fmu_kind_me or fmu_2_kind == FMIL.fmi2_fmu_kind_me_and_cs:
+-                model = FMUModelME2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir)
++                model = FMUModelME2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir))
+ 
+         #Could not match FMU kind with input-specified kind
+         if model is None: