/[pkgs]/devel/MagicPoint/magicpoint-1.11a-fix-gcc-warnings.patch
ViewVC logotype

Contents of /devel/MagicPoint/magicpoint-1.11a-fix-gcc-warnings.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.3 - (show annotations) (download) (as text)
Sat Oct 21 14:39:38 2006 UTC (3 years, 1 month ago) by jwrdegoede
Branch: MAIN
CVS Tags: MagicPoint-1_11b-9_fc12, FC-6-split, F-7-split, F-12-split, MagicPoint-1_11b-4_fc8, MagicPoint-1_11b-6_fc9, MagicPoint-1_11b-10_fc12, F-10-split, MagicPoint-1_11b-4_fc7, MagicPoint-1_11b-7_fc10, MagicPoint-1_11b-5_fc9, F-11-split, F-8-split, F-9-split, MagicPoint-1_11b-8_fc11, HEAD
Changes since 1.2: +0 -0 lines
File MIME type: text/x-patch 
* Sat Oct 21 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 1.11b-4
- Unorphan
- Take some patches from Debian
- Actually make ./configure detect and use freetype1, it was testing for it
  but the test failed
- Package mgp2html and mgp2latex from the contrib dir
1 diff -ruN magicpoint-1.11a.orig/contrib/xwintoppm/dsimple.c magicpoint-1.11a/contrib/xwintoppm/dsimple.c
2 --- magicpoint-1.11a.orig/contrib/xwintoppm/dsimple.c 1998-02-13 16:48:29.000000000 +0900
3 +++ magicpoint-1.11a/contrib/xwintoppm/dsimple.c 2004-09-15 21:09:10.000000000 +0900
4 @@ -495,6 +495,7 @@
5 * printf with up to 7 arguments.
6 */
7 /* VARARGS1 */
8 +void
9 outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
10 char *msg;
11 char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
12 diff -ruN magicpoint-1.11a.orig/contrib/xwintoppm/xwintoppm.c magicpoint-1.11a/contrib/xwintoppm/xwintoppm.c
13 --- magicpoint-1.11a.orig/contrib/xwintoppm/xwintoppm.c 1998-08-26 14:30:16.000000000 +0900
14 +++ magicpoint-1.11a/contrib/xwintoppm/xwintoppm.c 2004-09-15 21:09:10.000000000 +0900
15 @@ -281,6 +281,7 @@
16 * writting.
17 */
18
19 +void
20 Window_Dump(window, out)
21 Window window;
22 FILE *out;
23 @@ -716,9 +717,9 @@
24 return ncolors ;
25 }
26
27 -_swapshort (bp, n)
28 - register char *bp;
29 - register unsigned n;
30 +void
31 +_swapshort (register char *bp,
32 + register unsigned n)
33 {
34 register char c;
35 register char *ep = bp + n;
36 @@ -731,9 +732,9 @@
37 }
38 }
39
40 -_swaplong (bp, n)
41 - register char *bp;
42 - register unsigned n;
43 +void
44 +_swaplong (register char *bp,
45 + register unsigned n)
46 {
47 register char c;
48 register char *ep = bp + n;
49 diff -ruN magicpoint-1.11a.orig/image/gif.c magicpoint-1.11a/image/gif.c
50 --- magicpoint-1.11a.orig/image/gif.c 2000-03-07 15:59:56.000000000 +0900
51 +++ magicpoint-1.11a/image/gif.c 2004-09-15 21:09:11.000000000 +0900
52 @@ -103,7 +103,7 @@
53 if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth ||
54 GifFile->Image.Top + GifFile->Image.Height > GifFile->SHeight) {
55 fprintf(stderr,
56 -"Image %d is not confined to screen dimension, aborted.\n");
57 +"Image %d is not confined to screen dimension, aborted.\n", GifFile->ImageCount);
58 exit(-2);
59 }
60 if (GifFile->Image.Interlace) {
61 @@ -200,8 +200,8 @@
62 if (gifp == NULL)
63 ret = 0;
64 else {
65 + tellAboutImage(name, gifp);
66 DGifCloseFile(gifp);
67 - tellAboutImage(name);
68 ret = 1;
69 }
70 return ret;
71 diff -ruN magicpoint-1.11a.orig/image/pbm.c magicpoint-1.11a/image/pbm.c
72 --- magicpoint-1.11a.orig/image/pbm.c 1998-12-28 17:23:14.000000000 +0900
73 +++ magicpoint-1.11a/image/pbm.c 2004-09-15 21:05:27.000000000 +0900
74 @@ -359,8 +359,10 @@
75 */
76
77 destptr = image->data;
78 - for (y = 0; y < size; y++)
79 - *(destptr++) = PM_SCALE(*destptr, maxval, 0xff);
80 + for (y = 0; y < size; y++) {
81 + *destptr = PM_SCALE(*destptr, maxval, 0xff);
82 + destptr++;
83 + }
84 break;
85
86 case ITRUE:
87 diff -ruN magicpoint-1.11a.orig/image/png.c magicpoint-1.11a/image/png.c
88 --- magicpoint-1.11a.orig/image/png.c 2001-04-11 17:37:00.000000000 +0900
89 +++ magicpoint-1.11a/image/png.c 2004-09-15 21:09:11.000000000 +0900
90 @@ -44,7 +44,7 @@
91 #define PNG_CHECK_BYTES 4
92
93 int
94 -pngIdent(char *fullname, char *name) {}
95 +pngIdent(char *fullname, char *name) {return 0;}
96
97 Image *
98 pngLoad(fullname, name, verbose)
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2