cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build after jbigkit update to 2.0.

Browse Source
This commit is contained in:
ajacoutot 2013-04-13 08:53:47 +00:00
parent 856029fd98
commit 90889af0d0
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/netpbm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.62 2013/03/27 21:53:59 naddy Exp $
# $OpenBSD: Makefile,v 1.63 2013/04/13 08:53:47 ajacoutot Exp $
COMMENT= toolkit for converting images between different formats
@ -6,6 +6,7 @@ DISTNAME= netpbm-10.35.88
SHARED_LIBS= netpbm 2.0
CATEGORIES= graphics
HOMEPAGE= http://netpbm.sourceforge.net/
REVISION= 0
PERMIT_PACKAGE_CDROM= Yes
@ -18,7 +19,7 @@ WANTLIB= X11 Xau Xdmcp c jasper jbig jpeg m png pthread-stubs \
LIB_DEPENDS= graphics/tiff \
graphics/jpeg \
graphics/png \
graphics/jbigkit \
graphics/jbigkit>=2.0 \
graphics/jasper \
textproc/libxml

17
graphics/netpbm/patches/patch-converter_other_jbig_jbigtopnm_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-converter_other_jbig_jbigtopnm_c,v 1.1 2013/04/13 08:53:47 ajacoutot Exp $
Fix with jbigkit>=2.0:
jbg_strerror() no longer has a language attribute and the JBG_EN,
JBG_DE_8859_1, JBG_DE_UTF_8 constants no longer exist.
--- converter/other/jbig/jbigtopnm.c.orig Sat Apr 13 10:01:50 2013
+++ converter/other/jbig/jbigtopnm.c Sat Apr 13 10:01:32 2013
@@ -231,7 +231,7 @@ int main (int argc, char **argv)
pm_error("Problem while reading input file '%s", fnin);
if (result != JBG_EOK && result != JBG_EOK_INTR)
pm_error("Problem with input file '%s': %s\n",
- fnin, jbg_strerror(result, JBG_EN));
+ fnin, jbg_strerror(result));
if (plane >= 0 && jbg_dec_getplanes(&s) <= plane)
pm_error("Image has only %d planes!\n", jbg_dec_getplanes(&s));