summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2022-08-30 08:32:19 -0400
committerBrian Evans <grknight@gentoo.org>2022-08-30 08:32:19 -0400
commit8bc53d5a8d3e44354862a518f375386c5903c7f8 (patch)
tree0b75e775e0e9603e4dd3e07aebbaae40e98d1666 /dev-php
parentdev-lang/R: Stabilize 4.2.1 sparc, #867418 (diff)
downloadgentoo-8bc53d5a8d3e44354862a518f375386c5903c7f8.tar.gz
gentoo-8bc53d5a8d3e44354862a518f375386c5903c7f8.tar.bz2
gentoo-8bc53d5a8d3e44354862a518f375386c5903c7f8.zip
dev-php/jpgraph: Recreate patch for 4.3.5 for corefonts path
Closes: https://bugs.gentoo.org/867145 Signed-off-by: Brian Evans <grknight@gentoo.org>
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch31
-rw-r--r--dev-php/jpgraph/jpgraph-4.3.5.ebuild2
2 files changed, 32 insertions, 1 deletions
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
new file mode 100644
index 000000000000..ba4e37c98fba
--- /dev/null
+++ b/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch
@@ -0,0 +1,31 @@
+From fd1fc5e3c72ac4511f86852b1704821c440bdb3d Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 3 Jan 2017 12:56:18 -0500
+Subject: [PATCH 1/1] Set TTF_DIR to the Gentoo corefonts location.
+
+The default value of TTF_DIR in jpg-config.inc.php points to
+/usr/share/fonts/truetype, a location that does not exist on
+Gentoo. Since JpGraph largely only supports the Microsoft
+corefonts, we point it to /usr/share/fonts/corefonts instead.
+If the user does not have the corefonts installed, this is no
+great loss: neither location exists.
+---
+ src/jpg-config.inc.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/jpg-config.inc.php b/src/jpg-config.inc.php
+index ea16c1e..98cbdc7 100755
+--- a/src/jpg-config.inc.php
++++ b/src/jpg-config.inc.php
+@@ -36,7 +36,7 @@
+ //
+ //------------------------------------------------------------------------
+ // define('CACHE_DIR','/tmp/jpgraph_cache/');
+- define('TTF_DIR','/usr/share/fonts/truetype/msttcorefonts/');
++define('TTF_DIR','/usr/share/fonts/corefonts/');
+ // define('MBTTF_DIR','/usr/share/fonts/TrueType/');
+
+ //-------------------------------------------------------------------------
+--
+2.10.2
+
diff --git a/dev-php/jpgraph/jpgraph-4.3.5.ebuild b/dev-php/jpgraph/jpgraph-4.3.5.ebuild
index 534e39c0355d..2143d3e2edb4 100644
--- a/dev-php/jpgraph/jpgraph-4.3.5.ebuild
+++ b/dev-php/jpgraph/jpgraph-4.3.5.ebuild
@@ -27,7 +27,7 @@ src_prepare() {
# break without warning when the user e.g. removes corefonts. By
# applying the patch conditionally, we ensure a dependency on
# media-fonts/corefonts before anything will work.
- use truetype && eapply "${FILESDIR}/gentoo_ttf_dir.patch"
+ use truetype && eapply "${FILESDIR}/gentoo_ttf_dir-4.3.5.patch"
# Some of the documentation and examples are shipped in the "src"
# directory. We want them outside of that tree so that we can simply