Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add python-fontconfig to the macOS build.

Browse Source 
Needed to enable using genealogical symbols.
This commit is contained in:
John Ralls 2021-08-10 16:18:41 -07:00
parent ae7a2500de
commit 14618917c2
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mac/gramps.modules
View File

@ -179,6 +179,17 @@ https://files.pythonhosted.org/packages/
</after> </after>
</distutils> </distutils>
<distutils id='pyfontconfig'>
<branch repo='pymodules' version="0.5.1"
module="e6/01/a28b0160f82ca5e946e315251c797f07c74e5c5a53f2a9e706eebc680191/Python-fontconfig-0.5.1.tar.gz"
hash="sha256:b7cfe366242f83b8cd7175b7d4dd95d19f42d619c58a51914f72b1e741739994">
<patch file="python-fontconfig-curexc.patch" strip="1"/>
</branch>
<dependencies>
<dep package="python3"/>
<dep package="fontconfig"/>
</dependencies>
</distutils>
<metamodule id="meta-gramps-modules"> <metamodule id="meta-gramps-modules">
<dependencies> <dependencies>

56
mac/patches/pyfontconfig-curexc.patch Normal file
View File

@ -0,0 +1,56 @@
--- a/fontconfig.c 2011-11-02 07:59:41.000000000 -0700
+++ b/fontconfig.c 2021-08-09 18:07:50.000000000 -0700
@@ -4525,12 +4525,12 @@
Py_INCREF(local_type);
Py_INCREF(local_value);
Py_INCREF(local_tb);
- tmp_type = tstate->exc_type;
- tmp_value = tstate->exc_value;
- tmp_tb = tstate->exc_traceback;
- tstate->exc_type = local_type;
- tstate->exc_value = local_value;
- tstate->exc_traceback = local_tb;
+ tmp_type = tstate->curexc_type;
+ tmp_value = tstate->curexc_value;
+ tmp_tb = tstate->curexc_traceback;
+ tstate->curexc_type = local_type;
+ tstate->curexc_value = local_value;
+ tstate->curexc_traceback = local_tb;
/* Make sure tstate is in a consistent state when we XDECREF
these objects (XDECREF may run arbitrary code). */
Py_XDECREF(tmp_type);
@@ -4735,9 +4735,9 @@
static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
PyThreadState *tstate = PyThreadState_GET();
- *type = tstate->exc_type;
- *value = tstate->exc_value;
- *tb = tstate->exc_traceback;
+ *type = tstate->curexc_type;
+ *value = tstate->curexc_value;
+ *tb = tstate->curexc_traceback;
Py_XINCREF(*type);
Py_XINCREF(*value);
Py_XINCREF(*tb);
@@ -4746,12 +4746,12 @@
static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb) {
PyObject *tmp_type, *tmp_value, *tmp_tb;
PyThreadState *tstate = PyThreadState_GET();
- tmp_type = tstate->exc_type;
- tmp_value = tstate->exc_value;
- tmp_tb = tstate->exc_traceback;
- tstate->exc_type = type;
- tstate->exc_value = value;
- tstate->exc_traceback = tb;
+ tmp_type = tstate->curexc_type;
+ tmp_value = tstate->curexc_value;
+ tmp_tb = tstate->curexc_traceback;
+ tstate->curexc_type = type;
+ tstate->curexc_value = value;
+ tstate->curexc_traceback = tb;
Py_XDECREF(tmp_type);
Py_XDECREF(tmp_value);
Py_XDECREF(tmp_tb);
Diff finished. Mon Aug 9 18:09:16 2021