Ticket #68: Patch

File Patch, 1.8 KB (added by chris@…, 20 years ago)

Mistake in configure + two source files for a standard LFS system

Line 
1diff -Naur imlib-1.9.14/Imlib/Imlib_private.h imlib-1.9.14.orig/Imlib/Imlib_private.h
2--- imlib-1.9.14/Imlib/Imlib_private.h 2002-03-22 14:43:04.000000000 +0000
3+++ imlib-1.9.14.orig/Imlib/Imlib_private.h 2002-04-29 19:57:29.000000000 +0100
4@@ -34,7 +34,7 @@
5 #include <jpeglib.h>
6 #endif
7 #ifdef HAVE_LIBPNG
8-#include <png.h>
9+#include <libpng/png.h>
10 #endif
11 #ifdef HAVE_LIBTIFF
12 #include <tiffio.h>
13diff -Naur imlib-1.9.14/configure imlib-1.9.14.orig/configure
14--- imlib-1.9.14/configure 2002-03-25 16:45:33.000000000 +0000
15+++ imlib-1.9.14.orig/configure 2002-04-29 19:57:10.000000000 +0100
16@@ -7545,8 +7545,8 @@
17 char jpeg_destroy_decompress();
18
19 int main() {
20-jpeg_destroy_decompress()
21-; return 0; }
22+jpeg_destroy_decompress();
23+return 0; }
24 EOF
25 if { (eval echo configure:7552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26 rm -rf conftest*
27@@ -8010,7 +8010,7 @@
28 cat > conftest.$ac_ext <<EOF
29 #line 8012 "configure"
30 #include "confdefs.h"
31-#include <png.h>
32+#include <libpng/png.h>
33 EOF
34 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
35 { (eval echo configure:8017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
36@@ -8046,7 +8046,7 @@
37 cat > conftest.$ac_ext <<EOF
38 #line 8048 "configure"
39 #include "confdefs.h"
40-#include <png.h>
41+#include <libpng/png.h>
42 int main() {
43 png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct
44 ; png_set_IHDR;
45diff -Naur imlib-1.9.14/gdk_imlib/io-png.c imlib-1.9.14.orig/gdk_imlib/io-png.c
46--- imlib-1.9.14/gdk_imlib/io-png.c 2002-03-04 17:06:29.000000000 +0000
47+++ imlib-1.9.14.orig/gdk_imlib/io-png.c 2002-04-29 19:57:49.000000000 +0100
48@@ -4,7 +4,7 @@
49 #include "gdk_imlib_private.h"
50
51 #ifdef HAVE_LIBPNG
52-#include <png.h>
53+#include <libpng/png.h>
54
55 unsigned char *
56 loader_png (FILE * f, int *w, int *h, int *t)