1 |
commit: 8bc53d5a8d3e44354862a518f375386c5903c7f8 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 30 12:32:19 2022 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 30 12:32:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc53d5a |
7 |
|
8 |
dev-php/jpgraph: Recreate patch for 4.3.5 for corefonts path |
9 |
|
10 |
Closes: https://bugs.gentoo.org/867145 |
11 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
12 |
|
13 |
dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch | 31 ++++++++++++++++++++++++ |
14 |
dev-php/jpgraph/jpgraph-4.3.5.ebuild | 2 +- |
15 |
2 files changed, 32 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch b/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..ba4e37c98fba |
20 |
--- /dev/null |
21 |
+++ b/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch |
22 |
@@ -0,0 +1,31 @@ |
23 |
+From fd1fc5e3c72ac4511f86852b1704821c440bdb3d Mon Sep 17 00:00:00 2001 |
24 |
+From: Michael Orlitzky <michael@××××××××.com> |
25 |
+Date: Tue, 3 Jan 2017 12:56:18 -0500 |
26 |
+Subject: [PATCH 1/1] Set TTF_DIR to the Gentoo corefonts location. |
27 |
+ |
28 |
+The default value of TTF_DIR in jpg-config.inc.php points to |
29 |
+/usr/share/fonts/truetype, a location that does not exist on |
30 |
+Gentoo. Since JpGraph largely only supports the Microsoft |
31 |
+corefonts, we point it to /usr/share/fonts/corefonts instead. |
32 |
+If the user does not have the corefonts installed, this is no |
33 |
+great loss: neither location exists. |
34 |
+--- |
35 |
+ src/jpg-config.inc.php | 2 +- |
36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
37 |
+ |
38 |
+diff --git a/src/jpg-config.inc.php b/src/jpg-config.inc.php |
39 |
+index ea16c1e..98cbdc7 100755 |
40 |
+--- a/src/jpg-config.inc.php |
41 |
++++ b/src/jpg-config.inc.php |
42 |
+@@ -36,7 +36,7 @@ |
43 |
+ // |
44 |
+ //------------------------------------------------------------------------ |
45 |
+ // define('CACHE_DIR','/tmp/jpgraph_cache/'); |
46 |
+- define('TTF_DIR','/usr/share/fonts/truetype/msttcorefonts/'); |
47 |
++define('TTF_DIR','/usr/share/fonts/corefonts/'); |
48 |
+ // define('MBTTF_DIR','/usr/share/fonts/TrueType/'); |
49 |
+ |
50 |
+ //------------------------------------------------------------------------- |
51 |
+-- |
52 |
+2.10.2 |
53 |
+ |
54 |
|
55 |
diff --git a/dev-php/jpgraph/jpgraph-4.3.5.ebuild b/dev-php/jpgraph/jpgraph-4.3.5.ebuild |
56 |
index 534e39c0355d..2143d3e2edb4 100644 |
57 |
--- a/dev-php/jpgraph/jpgraph-4.3.5.ebuild |
58 |
+++ b/dev-php/jpgraph/jpgraph-4.3.5.ebuild |
59 |
@@ -27,7 +27,7 @@ src_prepare() { |
60 |
# break without warning when the user e.g. removes corefonts. By |
61 |
# applying the patch conditionally, we ensure a dependency on |
62 |
# media-fonts/corefonts before anything will work. |
63 |
- use truetype && eapply "${FILESDIR}/gentoo_ttf_dir.patch" |
64 |
+ use truetype && eapply "${FILESDIR}/gentoo_ttf_dir-4.3.5.patch" |
65 |
|
66 |
# Some of the documentation and examples are shipped in the "src" |
67 |
# directory. We want them outside of that tree so that we can simply |