colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107976 from ali-abrar/aa/weasyprint52

Browse Source 
python-modules.weasyprint: 50 -> 52
This commit is contained in:
Sandro 2021-01-04 03:58:07 +01:00 committed by GitHub
commit 9bf170109d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/weasyprint/default.nix
View File

@ -23,7 +23,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "weasyprint"; pname = "weasyprint";
version = "50"; version = "52";
disabled = !isPy3k; disabled = !isPy3k;
# excluded test needs the Ahem font # excluded test needs the Ahem font
@ -59,7 +59,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "WeasyPrint"; pname = "WeasyPrint";
sha256 = "0invs96zvmcr6wh5klj52jrcnr9qg150v9wpmbhcsf3vv1d1hbcw"; sha256 = "0rwf43111ws74m8b1alkkxzz57g0np3vmd8as74adwnxslfcg4gs";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

16
pkgs/development/python-modules/weasyprint/library-paths.patch
View File

@ -1,8 +1,8 @@
diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py
index 377716c1..2016e01c 100644 index 79e3b5b..4438eb4 100644
--- a/weasyprint/fonts.py --- a/weasyprint/fonts.py
+++ b/weasyprint/fonts.py +++ b/weasyprint/fonts.py
@@ -48,11 +48,8 @@ else: @@ -45,11 +45,8 @@ else:
# with OSError: dlopen() failed to load a library: cairo / cairo-2 # with OSError: dlopen() failed to load a library: cairo / cairo-2
# So let's hope we find the same file as cairo already did ;) # So let's hope we find the same file as cairo already did ;)
# Same applies to pangocairo requiring pangoft2 # Same applies to pangocairo requiring pangoft2
@ -10,26 +10,26 @@ index 377716c1..2016e01c 100644
- 'libfontconfig-1.dll', - 'libfontconfig-1.dll',
- 'libfontconfig.so.1', 'libfontconfig-1.dylib') - 'libfontconfig.so.1', 'libfontconfig-1.dylib')
- pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0', - pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0',
- 'libpangoft2-1.0.so', 'libpangoft2-1.0.dylib') - 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib')
+ fontconfig = dlopen(ffi, '@fontconfig@') + fontconfig = dlopen(ffi, '@fontconfig@')
+ pangoft2 = dlopen(ffi, '@pangoft2@') + pangoft2 = dlopen(ffi, '@pangoft2@')
ffi.cdef(''' ffi.cdef('''
// FontConfig // FontConfig
diff --git a/weasyprint/text.py b/weasyprint/text.py diff --git a/weasyprint/text.py b/weasyprint/text.py
index 035074e9..08e40395 100644 index 1dc5e4d..b070bad 100644
--- a/weasyprint/text.py --- a/weasyprint/text.py
+++ b/weasyprint/text.py +++ b/weasyprint/text.py
@@ -243,12 +243,9 @@ def dlopen(ffi, *names): @@ -255,12 +255,9 @@ def dlopen(ffi, *names):
return ffi.dlopen(names[0]) # pragma: no cover return ffi.dlopen(names[0]) # pragma: no cover
-gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so', -gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so.0',
- 'libgobject-2.0.dylib') - 'libgobject-2.0.dylib')
-pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so', -pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0',
- 'libpango-1.0.dylib') - 'libpango-1.0.dylib')
-pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0', -pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0',
- 'libpangocairo-1.0.so', 'libpangocairo-1.0.dylib') - 'libpangocairo-1.0.so.0', 'libpangocairo-1.0.dylib')
+gobject = dlopen(ffi, '@gobject@') +gobject = dlopen(ffi, '@gobject@')
+pango = dlopen(ffi, '@pango@') +pango = dlopen(ffi, '@pango@')
+pangocairo = dlopen(ffi, '@pangocairo@') +pangocairo = dlopen(ffi, '@pangocairo@')