1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
Description: Use system-provided fonts instead of their local copies.
Author: Andrius Merkys <merkys@debian.org>
Forwarded: not-needed
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,14 +38,14 @@
SUBDIRS = auxil scheme python macros compat utils protein_db mini-mol geometry \
lidia-core coot-utils angles ccp4mg-utils db-main analysis cootaneer ideal ligand coords \
density-contour skeleton high-res build MoleculesToTriangles pli \
- python-tests cootilus fonts pyrogen data monomers \
+ python-tests cootilus pyrogen data monomers \
man rama-data glTF pixmaps textures api
else
# rcrane is not included yet.
SUBDIRS = auxil scheme python macros compat utils protein_db mini-mol geometry \
lidia-core coot-utils angles ccp4mg-utils db-main analysis cootaneer ideal ligand coords \
density-contour skeleton high-res build MoleculesToTriangles pli greg-tests \
- python-tests cootilus fonts pyrogen data \
+ python-tests cootilus pyrogen data \
man rama-data doc glTF pixmaps textures sounds reference-structures api layla validation-graphs src ui
endif
endif
--- a/configure.ac
+++ b/configure.ac
@@ -573,7 +573,6 @@
reference-structures/Makefile
api/Makefile
pli/Makefile
-fonts/Makefile
pyrogen/Makefile
pyrogen/pyrogen
layla/Makefile
--- a/pyrogen/pyrogen.py
+++ b/pyrogen/pyrogen.py
@@ -862,7 +862,7 @@
dir_1 = os.path.join(prfx, 'share')
dir_2 = os.path.join(dir_1, 'coot')
dir_3 = os.path.join(dir_2, 'fonts')
- font_file=os.path.join(dir_3, font_file_base_name)
+ font_file="/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf"
if os.path.isfile(font_file):
font=ImageFont.truetype(font_file, 16)
return font
--- a/src/graphics-info-init.cc
+++ b/src/graphics-info-init.cc
@@ -48,7 +48,7 @@
FT_Face face;
std::string pkgdatadir = coot::package_data_dir();
std::string font_dir = coot::util::append_dir_dir(pkgdatadir, "fonts");
- std::string font_path = coot::util::append_dir_file(font_dir, "Vera.ttf");
+ std::string font_path = "/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf";
if (! coot::file_exists(font_path))
font_path = "fonts/Vera.ttf";
if (FT_New_Face(ft, font_path.c_str(), 0, &face)) {
|
