Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at 20.03 38 lines 1.5 kB view raw
1diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py 2index 377716c1..2016e01c 100644 3--- a/weasyprint/fonts.py 4+++ b/weasyprint/fonts.py 5@@ -48,11 +48,8 @@ else: 6 # with OSError: dlopen() failed to load a library: cairo / cairo-2 7 # So let's hope we find the same file as cairo already did ;) 8 # Same applies to pangocairo requiring pangoft2 9- fontconfig = dlopen(ffi, 'fontconfig', 'libfontconfig', 10- 'libfontconfig-1.dll', 11- 'libfontconfig.so.1', 'libfontconfig-1.dylib') 12- pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0', 13- 'libpangoft2-1.0.so', 'libpangoft2-1.0.dylib') 14+ fontconfig = dlopen(ffi, '@fontconfig@') 15+ pangoft2 = dlopen(ffi, '@pangoft2@') 16 17 ffi.cdef(''' 18 // FontConfig 19diff --git a/weasyprint/text.py b/weasyprint/text.py 20index 035074e9..08e40395 100644 21--- a/weasyprint/text.py 22+++ b/weasyprint/text.py 23@@ -243,12 +243,9 @@ def dlopen(ffi, *names): 24 return ffi.dlopen(names[0]) # pragma: no cover 25 26 27-gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so', 28- 'libgobject-2.0.dylib') 29-pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so', 30- 'libpango-1.0.dylib') 31-pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0', 32- 'libpangocairo-1.0.so', 'libpangocairo-1.0.dylib') 33+gobject = dlopen(ffi, '@gobject@') 34+pango = dlopen(ffi, '@pango@') 35+pangocairo = dlopen(ffi, '@pangocairo@') 36 37 gobject.g_type_init() 38