Attachment 187508 Details for Bug 223270 – patch file

[patch] patch file

graphics_jbigkit.patch (text/plain), 4.09 KB, created by Yasuhiro Kimura on 2017-10-27 07:23:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2017-10-27 07:23:56 UTC

Size: 4.09 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 452860)
>+++ Makefile	(working copy)
>@@ -10,6 +10,9 @@
> MAINTAINER=	mi@aldan.algebra.com
> COMMENT=	Lossless compression for bi-level images such as scanned pages, faxes
> 
>+LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> USE_LDCONFIG=	yes
> MANS=		jbgtopbm.1 pbmtojbg.1
> BINS=		jbgtopbm pbmtojbg jbgtopbm85 pbmtojbg85
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 452860)
>+++ files/patch-Makefile	(working copy)
>@@ -1,5 +1,5 @@
>---- ./Makefile.orig	2014-03-27 18:47:15.000000000 +0000
>-+++ ./Makefile	2014-06-21 22:53:57.000000000 +0000
>+--- Makefile.orig	2014-03-27 18:47:15 UTC
>++++ Makefile
> @@ -1,24 +1,22 @@
>  # Unix makefile for JBIG-KIT
>  
>Index: files/patch-libjbig_Makefile
>===================================================================
>--- files/patch-libjbig_Makefile	(revision 452860)
>+++ files/patch-libjbig_Makefile	(working copy)
>@@ -1,6 +1,7 @@
>---- libjbig/Makefile	2014-03-27 14:47:15.000000000 -0400
>-+++ libjbig/Makefile	2014-04-08 08:43:57.000000000 -0400
>-@@ -2,10 +2,14 @@
>+--- libjbig/Makefile.orig	2014-03-27 18:47:15 UTC
>++++ libjbig/Makefile
>+@@ -1,12 +1,16 @@
>+ # Unix makefile for the JBIG-KIT library
>  
>  # Select an ANSI/ISO C compiler here, GNU gcc is recommended
> -CC = gcc
>@@ -18,7 +19,9 @@
> +	$(CC) -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
>  
>  tstcodec: tstcodec.o jbig.o jbig_ar.o
>-@@ -20,4 +24,8 @@
>+ 	$(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
>+@@ -19,11 +23,19 @@ libjbig.a: jbig.o jbig_ar.o
>+ 	ar rc libjbig.a jbig.o jbig_ar.o
>  	-ranlib libjbig.a
>  
> +libjbig.so.2: jbig.So jbig_ar.So
>@@ -27,7 +30,7 @@
> +
>  libjbig85.a: jbig85.o jbig_ar.o
>  	rm -f libjbig85.a
>-@@ -25,4 +33,8 @@
>+ 	ar rc libjbig85.a jbig85.o jbig_ar.o
>  	-ranlib libjbig85.a
>  
> +libjbig85.so.1: jbig85.So jbig_ar.So
>@@ -36,3 +39,4 @@
> +
>  jbig.o: jbig.c jbig.h jbig_ar.h
>  jbig85.o: jbig85.c jbig85.h jbig_ar.h
>+ jbig_ar.o: jbig_ar.c jbig_ar.h
>Index: files/patch-pbmtools_Makefile
>===================================================================
>--- files/patch-pbmtools_Makefile	(revision 452860)
>+++ files/patch-pbmtools_Makefile	(working copy)
>@@ -1,6 +1,7 @@
>---- pbmtools/Makefile	2014-03-27 14:47:15.000000000 -0400
>-+++ pbmtools/Makefile	2014-04-08 09:18:42.000000000 -0400
>-@@ -2,14 +2,14 @@
>+--- pbmtools/Makefile.orig	2014-03-27 18:47:15 UTC
>++++ pbmtools/Makefile
>+@@ -1,16 +1,16 @@
>+ # Unix makefile for the JBIG-KIT PBM tools
>  
>  # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
> -CC = gcc
>@@ -19,7 +20,9 @@
> +all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85
>  
>  txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
>-@@ -144,6 +144,8 @@
>+ 
>+@@ -143,8 +143,10 @@ dotest85b: test-$(IMG).pbm
>+ 	./jbgtopbm85 -B 1 test-$(IMG).jbg85 test-$(IMG).pbm85
>  	cmp test-$(IMG).pbm test-$(IMG).pbm85
>  
> -test-%.pbm: ../examples/%.jbg
>@@ -30,3 +33,4 @@
> +.endfor
>  
>  test-t82.pbm:
>+ 	make -C ../libjbig tstcodec
>Index: files/patch-warnings
>===================================================================
>--- files/patch-warnings	(revision 452860)
>+++ files/patch-warnings	(working copy)
>@@ -1,6 +1,7 @@
>---- pbmtools/pbmtojbg85.c	2014-03-27 14:47:15.000000000 -0400
>-+++ pbmtools/pbmtojbg85.c	2014-04-08 09:00:16.000000000 -0400
>-@@ -71,8 +71,12 @@
>+--- pbmtools/pbmtojbg.c.orig	2014-03-27 18:47:15 UTC
>++++ pbmtools/pbmtojbg.c
>+@@ -86,10 +86,14 @@ static unsigned long getint(FILE *f)
>+       while ((c = getc(f)) != EOF && !(c == 13 || c == 10)) ;
>    if (c != EOF) {
>      ungetc(c, f);
> -    fscanf(f, "%lu", &i);
>@@ -15,10 +16,12 @@
> -  return i;
> +  return -1;
>  }
>-
>---- pbmtools/pbmtojbg.c	2014-03-27 14:47:15.000000000 -0400
>-+++ pbmtools/pbmtojbg.c	2014-04-08 09:00:16.000000000 -0400
>-@@ -87,8 +87,12 @@
>+ 
>+ 
>+--- pbmtools/pbmtojbg85.c.orig	2014-03-27 18:47:15 UTC
>++++ pbmtools/pbmtojbg85.c
>+@@ -70,10 +70,14 @@ static unsigned long getint(FILE *f)
>+       while ((c = getc(f)) != EOF && !(c == 13 || c == 10)) ;
>    if (c != EOF) {
>      ungetc(c, f);
> -    fscanf(f, "%lu", &i);
>@@ -34,3 +37,4 @@
> +  return -1;
>  }
>  
>+

Actions: View | Diff

Attachments on bug 223270: 187508