zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r-textshaping,r-ragg: Add dep on pkgconfig, type="build" and handle freetype@2.13.3 (#47091)

Browse Source 
* r-textshaping: build-dep on pkgconfig to find harfbuzz
* r-ragg: Fix build with freetype@2.13.3
This commit is contained in:
Bernhard Kaindl 2024-10-29 17:22:10 +00:00 committed by GitHub
parent f889b2a95e
commit ffc904aa6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/r-ragg/package.py
View File

@ -28,3 +28,9 @@ class RRagg(RPackage):
depends_on("libpng")
depends_on("libtiff")
depends_on("jpeg")
def flag_handler(self, name, flags):
# Freetype 2.13.3 broke the public interface by switching char/unsigned char:
if name == "cxxflags" and self.spec["freetype"].version >= Version("2.13.3"):
flags.append("-fpermissive")
return (flags, None, None)

1
var/spack/repos/builtin/packages/r-textshaping/package.py
View File

@ -23,6 +23,7 @@ class RTextshaping(RPackage):
depends_on("r@3.2.0:", type=("build", "run"))
depends_on("r-systemfonts@1.0.0:", type=("build", "run"))
depends_on("r-cpp11@0.2.1:", type=("build", "run"))
depends_on("pkgconfig", type="build")
depends_on("freetype")
depends_on("harfbuzz")
depends_on("fribidi")