Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 399896 Details for
Bug 529800
media-gfx/hp2xx-3.4.4: fails to build
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
hp2xx-3.4.4-r3.patch
hp2xx-3.4.4-r3.patch (text/plain), 3.54 KB, created by
Konstantin Münning
on 2015-03-27 20:04:26 UTC
(
hide
)
Description:
hp2xx-3.4.4-r3.patch
Filename:
MIME Type:
Creator:
Konstantin Münning
Created:
2015-03-27 20:04:26 UTC
Size:
3.54 KB
patch
obsolete
>diff -ruN hp2xx-3.4.4-r0/doc/hp2xxinf.tex hp2xx-3.4.4-r3/doc/hp2xxinf.tex >--- hp2xx-3.4.4-r0/doc/hp2xxinf.tex 2003-06-21 17:41:16.000000000 +0200 >+++ hp2xx-3.4.4-r3/doc/hp2xxinf.tex 2015-03-27 20:36:32.000000000 +0100 >@@ -92,7 +92,7 @@ > @page > @tex > {\parskip=0pt >-\hfill mk\@daveg.com\par >+\hfill mk@@daveg.com\par > \hfill {\it Using HP2XX}, \manvers\par > \hfill \TeX{}info \texinfoversion\par > } >diff -ruN hp2xx-3.4.4-r0/makes/generic.mak hp2xx-3.4.4-r3/makes/generic.mak >--- hp2xx-3.4.4-r0/makes/generic.mak 2003-06-21 17:16:35.000000000 +0200 >+++ hp2xx-3.4.4-r3/makes/generic.mak 2015-03-27 20:38:10.000000000 +0100 >@@ -30,11 +30,11 @@ > CP = cp > MKINFO = makeinfo > RMCMD = rm -f >-STRIP = strip >+STRIP = true > > # Installation sites (GNU conventions): > # >-prefix = /usr/local >+prefix = /usr > bindir = $(prefix)/bin > includedir = $(prefix)/include > mandir = $(prefix)/man >@@ -44,10 +44,10 @@ > # CC and CFLAGS set for gcc, but any ANSI-C compiler should work. > # For non-gcc compilers, simply set CFLAGS = -O (to start with) > # >-CC = gcc >-CFLAGS = -O2 -Wall -finline-functions >+#CC = gcc >+#CFLAGS = -O2 -Wall -finline-functions > >-LFLAGS = # only sometimes needed; see below for examples >+LFLAGS = $(LDFLAGS) # only sometimes needed; see below for examples > CPPFLAGS = -I. # only sometimes needed; see below for examples > BINDCMD = # only needed for EMX and DJGPP DOS extenders > >@@ -60,9 +60,9 @@ > # > # Generic UNIX + X11 previewer (default) > # >-DEFINES = -DUNIX -DHAS_UNIX_X11 >-PREVIEWER = to_x11 >-ALL_LIBS = -lX11 -lm # Maybe -lX instead of -lX11 is needed? >+#DEFINES = -DUNIX -DHAS_UNIX_X11 >+#PREVIEWER = to_x11 >+#ALL_LIBS = -lX11 -lm # Maybe -lX instead of -lX11 is needed? > # > # Generic UNIX, no previewer > # >@@ -191,10 +191,10 @@ > # Decide below if you want to include some extra modes: > # Recommendation: Add PIC & PAC only for ATARI > # >-# Standard setting: No extras: >-EX_SRC = >-EX_OBJ = >-EX_DEFS = >+# Standard setting: No extras, defined externally: >+#EX_SRC = >+#EX_OBJ = >+#EX_DEFS = > # > # PNG support (requires -lpng and -lz on the ALL_LIBS line) > #EX_SRC = png.c to_png.c >@@ -217,9 +217,14 @@ > #EX_DEFS = -DUSEPDF > # > # Include extras: >-# EX_SRC = to_pic.c to_pac.c >-# EX_OBJ = to_pic.o to_pac.o >-# EX_DEFS = -DPIC_PAC >+EX_SRC += to_pic.c to_pac.c >+EX_OBJ += to_pic.o to_pac.o >+EX_DEFS += -DPIC_PAC >+# >+# Epson Esc/P2 support >+EX_SRC += to_escp2.c >+EX_OBJ += to_escp2.o >+EX_DEFS += -DEPSON > # > ############################################################################# > # No user-serviceable parts below! >@@ -245,8 +250,8 @@ > PROGRAM = hp2xx > > default: >- @echo "This makefile needs manual configuration! Edit it now! >- @echo "After configuration, you may use the following commands: >+ @echo "This makefile needs manual configuration! Edit it now!" >+ @echo "After configuration, you may use the following commands:" > @echo "" > @echo "make all Compile everything" > @echo "make check Run a color application in preview mode" >diff -ruN hp2xx-3.4.4-r0/sources/png.c hp2xx-3.4.4-r3/sources/png.c >--- hp2xx-3.4.4-r0/sources/png.c 2003-06-21 17:31:51.000000000 +0200 >+++ hp2xx-3.4.4-r3/sources/png.c 2015-03-27 20:38:10.000000000 +0100 >@@ -5,6 +5,7 @@ > #include <stdio.h> > #include <stdlib.h> > #include "to_png.h" >+#include <zlib.h> > #include <png.h> > > #define PDNCOL 256 >@@ -36,7 +37,7 @@ > } > > /* set up error handlimg for libpng */ >- if (setjmp(png_ptr->jmpbuf)) { >+ if (setjmp(png_jmpbuf(png_ptr))) { > png_destroy_write_struct(&png_ptr, &info_ptr); > return; > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 529800
:
389674
| 399896 |
399898