diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-20 09:42:12 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-29 14:02:48 -0500 |
| commit | c601e2bf9adb05dc9dd9f3a565f693e968eb785c (patch) | |
| tree | 5e9484e4043df410d167c343e53b92590480ebd0 /gnu/packages/patches | |
| parent | e59a26cf3e08ca380650b60ae44edd1fd2b02322 (diff) | |
| download | guix-c601e2bf9adb05dc9dd9f3a565f693e968eb785c.tar guix-c601e2bf9adb05dc9dd9f3a565f693e968eb785c.tar.gz | |
gnu: weasyprint: Update to 52.1.
Fixes <https://issues.guix.gnu.org/42409>.
* gnu/packages/patches/weasyprint-library-paths.patch: Delete.
* gnu/packages/pdf.scm (weasyprint): Update to 52.1
[phases]{patch-library-paths}: Adjust.
{check}: Remove.
{register-dejavu-font}: New phase.
[native-inputs]: Add font-dejavu.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/weasyprint-library-paths.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/gnu/packages/patches/weasyprint-library-paths.patch b/gnu/packages/patches/weasyprint-library-paths.patch deleted file mode 100644 index 317f0c542e..0000000000 --- a/gnu/packages/patches/weasyprint-library-paths.patch +++ /dev/null @@ -1,43 +0,0 @@ -Make weasyprint load dynamic libraries from hard-coded path. - -From NixOS -pkgs/development/python-modules/weasyprint/library-paths.patch - -diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py -index 377716c1..2016e01c 100644 ---- a/weasyprint/fonts.py -+++ b/weasyprint/fonts.py -@@ -48,11 +48,8 @@ else: - # with OSError: dlopen() failed to load a library: cairo / cairo-2 - # So let's hope we find the same file as cairo already did ;) - # Same applies to pangocairo requiring pangoft2 -- fontconfig = dlopen(ffi, 'fontconfig', 'libfontconfig', -- 'libfontconfig-1.dll', -- 'libfontconfig.so.1', 'libfontconfig-1.dylib') -- pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0', -- 'libpangoft2-1.0.so', 'libpangoft2-1.0.dylib') -+ fontconfig = dlopen(ffi, '@fontconfig@') -+ pangoft2 = dlopen(ffi, '@pangoft2@') - - ffi.cdef(''' - // FontConfig -diff --git a/weasyprint/text.py b/weasyprint/text.py -index 035074e9..08e40395 100644 ---- a/weasyprint/text.py -+++ b/weasyprint/text.py -@@ -243,12 +243,9 @@ def dlopen(ffi, *names): - return ffi.dlopen(names[0]) # pragma: no cover - - --gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so', -- 'libgobject-2.0.dylib') --pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so', -- 'libpango-1.0.dylib') --pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0', -- 'libpangocairo-1.0.so', 'libpangocairo-1.0.dylib') -+gobject = dlopen(ffi, '@gobject@') -+pango = dlopen(ffi, '@pango@') -+pangocairo = dlopen(ffi, '@pangocairo@') - - gobject.g_type_init() - |