diff options
| author | ryoon <ryoon@pkgsrc.org> | 2021-05-07 17:41:49 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2021-05-07 17:41:49 +0000 |
| commit | f7eb0fe1ab350afb41aa9d75892476af1457ffad (patch) | |
| tree | 6dd065e4e8e48b8a23fdd3e880e7a72a78ec20bf | |
| parent | b0bc5ac0b3ada90b4c343de5ec6485bd57d52417 (diff) | |
| download | pkgsrc-f7eb0fe1ab350afb41aa9d75892476af1457ffad.tar.gz | |
electrix: Fix PDF support with recent print/poppler
Fix PR kern/56156.
poppler-cairo.pc is already removed from print/poppler.
Remove poppler-cairo detection and use from WAF wscript.
Bump PKGREVISION.
| -rw-r--r-- | print/electrix/Makefile | 4 | ||||
| -rw-r--r-- | print/electrix/distinfo | 3 | ||||
| -rw-r--r-- | print/electrix/patches/patch-wscript | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/print/electrix/Makefile b/print/electrix/Makefile index 5261aa152a2..613a84ed040 100644 --- a/print/electrix/Makefile +++ b/print/electrix/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.81 2021/04/15 11:23:10 ryoon Exp $ +# $NetBSD: Makefile,v 1.82 2021/05/07 17:41:49 ryoon Exp $ DISTNAME= electrix-0.2.0 -PKGREVISION= 76 +PKGREVISION= 77 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=electrix/} EXTRACT_SUFX= .tar.bz2 diff --git a/print/electrix/distinfo b/print/electrix/distinfo index df8dae0a940..12a25e96d09 100644 --- a/print/electrix/distinfo +++ b/print/electrix/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 01:01:32 agc Exp $ +$NetBSD: distinfo,v 1.3 2021/05/07 17:41:49 ryoon Exp $ SHA1 (electrix-0.2.0.tar.bz2) = d1473b1644c2c64ec67acd7bdaf98d7396bc3d99 RMD160 (electrix-0.2.0.tar.bz2) = 36fa0377bd9bbd4e514eeaeeb951998849c8583c SHA512 (electrix-0.2.0.tar.bz2) = 5092b9126518bed3bc4f7925a273462b8f18e08535af8426a7f8db8b7ad56b3c28139657efa7133235b675e591ee54b140186552e58312885d2e703aaaf82380 Size (electrix-0.2.0.tar.bz2) = 134220 bytes +SHA1 (patch-wscript) = be0360e375553aea744e3eddda0abd90eec93549 diff --git a/print/electrix/patches/patch-wscript b/print/electrix/patches/patch-wscript new file mode 100644 index 00000000000..1641dc3a3b3 --- /dev/null +++ b/print/electrix/patches/patch-wscript @@ -0,0 +1,20 @@ +$NetBSD: patch-wscript,v 1.1 2021/05/07 17:41:49 ryoon Exp $ + +* poppler-cairo.pc is removed from print/poppler. + See: https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/675/diffs?commit_id=85f6354f36d5d4f6bb7c1708f408d7522a9356d6 + +--- wscript.orig 2011-11-06 16:55:13.000000000 +0000 ++++ wscript +@@ -47,11 +47,9 @@ def configure (conf): + try: + conf.check_cfg (package = 'poppler-glib', uselib_store = 'POPPLER_GLIB', + atleast_version='0.12.0', args = '--cflags --libs') +- conf.check_cfg (package = 'poppler-cairo', uselib_store = 'POPPLER_CAIRO', +- args = '--cflags --libs') + except: + pass +- if conf.env['HAVE_POPPLER_GLIB' and 'HAVE_POPPLER_CAIRO']: ++ if conf.env['HAVE_POPPLER_GLIB']: + message = 'enabled' + conf.define ('ENABLE_PDF', 1) + conf.env['ENABLE_PDF'] = 1 |