Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13122/10.7/stable/main/finkinfo/libs
Modified Files: fltk13-aqua.info fltk13-aqua.patch Log Message: >From J. Howarth: use upstream patch for libjpeg9. Index: fltk13-aqua.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/fltk13-aqua.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fltk13-aqua.patch 27 Aug 2011 21:23:49 -0000 1.1 +++ fltk13-aqua.patch 22 Jul 2013 14:30:56 -0000 1.2 @@ -70,3 +70,142 @@ $(RM) libfltk_images.dylib $(LN) libfltk_images.1.3.dylib libfltk_images.dylib +--- fltk-1.3.2/src/fl_diamond_box.cxx.orig 2013-07-19 08:28:44.000000000 -0400 ++++ fltk-1.3.2/src/fl_diamond_box.cxx 2013-07-19 08:30:28.000000000 -0400 +@@ -34,13 +34,13 @@ + int y1 = y+h/2; + fl_color(bgcolor); fl_polygon(x+3, y1, x1,y+3, x+w-3,y1, x1,y+h-3); + uchar *g = fl_gray_ramp(); +- fl_color(g['W']); fl_line(x+1, y1, x1, y+1, x+w-1, y1); +- fl_color(g['U']); fl_line(x+2, y1, x1, y+2, x+w-2, y1); +- fl_color(g['S']); fl_line(x+3, y1, x1, y+3, x+w-3, y1); +- fl_color(g['P']); fl_line(x+3, y1, x1, y+h-3, x+w-3, y1); +- fl_color(g['N']); fl_line(x+2, y1, x1, y+h-2, x+w-2, y1); +- fl_color(g['H']); fl_line(x+1, y1, x1, y+h-1, x+w-1, y1); +- fl_color(g['A']); fl_loop(x, y1, x1, y, x+w, y1, x1, y+h); ++ fl_color(g[(uchar)'W']); fl_line(x+1, y1, x1, y+1, x+w-1, y1); ++ fl_color(g[(uchar)'U']); fl_line(x+2, y1, x1, y+2, x+w-2, y1); ++ fl_color(g[(uchar)'S']); fl_line(x+3, y1, x1, y+3, x+w-3, y1); ++ fl_color(g[(uchar)'P']); fl_line(x+3, y1, x1, y+h-3, x+w-3, y1); ++ fl_color(g[(uchar)'N']); fl_line(x+2, y1, x1, y+h-2, x+w-2, y1); ++ fl_color(g[(uchar)'H']); fl_line(x+1, y1, x1, y+h-1, x+w-1, y1); ++ fl_color(g[(uchar)'A']); fl_loop(x, y1, x1, y, x+w, y1, x1, y+h); + } + + static void fl_diamond_down_box(int x,int y,int w,int h,Fl_Color bgcolor) { +@@ -49,14 +49,14 @@ + int x1 = x+w/2; + int y1 = y+h/2; + uchar *g = fl_gray_ramp(); +- fl_color(g['P']); fl_line(x+0, y1, x1, y+0, x+w-0, y1); +- fl_color(g['N']); fl_line(x+1, y1, x1, y+1, x+w-1, y1); +- fl_color(g['H']); fl_line(x+2, y1, x1, y+2, x+w-2, y1); +- fl_color(g['W']); fl_line(x+2, y1, x1, y+h-2, x+w-2, y1); +- fl_color(g['U']); fl_line(x+1, y1, x1, y+h-1, x+w-1, y1); +- fl_color(g['S']); fl_line(x+0, y1, x1, y+h-0, x+w-0, y1); ++ fl_color(g[(uchar)'P']); fl_line(x+0, y1, x1, y+0, x+w-0, y1); ++ fl_color(g[(uchar)'N']); fl_line(x+1, y1, x1, y+1, x+w-1, y1); ++ fl_color(g[(uchar)'H']); fl_line(x+2, y1, x1, y+2, x+w-2, y1); ++ fl_color(g[(uchar)'W']); fl_line(x+2, y1, x1, y+h-2, x+w-2, y1); ++ fl_color(g[(uchar)'U']); fl_line(x+1, y1, x1, y+h-1, x+w-1, y1); ++ fl_color(g[(uchar)'S']); fl_line(x+0, y1, x1, y+h-0, x+w-0, y1); + fl_color(bgcolor); fl_polygon(x+3, y1, x1,y+3, x+w-3,y1, x1,y+h-3); +- fl_color(g['A']); fl_loop(x+3, y1, x1, y+3, x+w-3, y1, x1, y+h-3); ++ fl_color(g[(uchar)'A']); fl_loop(x+3, y1, x1, y+3, x+w-3, y1, x1, y+h-3); + } + + extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*); +--- fltk-1.3.2/src/fl_round_box.cxx.orig 2013-07-19 08:31:37.000000000 -0400 ++++ fltk-1.3.2/src/fl_round_box.cxx 2013-07-19 08:32:51.000000000 -0400 +@@ -76,29 +76,29 @@ + void fl_round_down_box(int x, int y, int w, int h, Fl_Color bgcolor) { + uchar *g = fl_gray_ramp(); + draw(FILL, x, y, w, h, 2, bgcolor); +- draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g['N']); +- draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g['H']); +- draw(UPPER_LEFT, x, y, w, h, 0, (Fl_Color)g['N']); +- draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g['H']); +- draw(LOWER_RIGHT, x, y, w, h, 0, (Fl_Color)g['S']); +- draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g['U']); +- draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g['U']); +- draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g['W']); +- draw(CLOSED, x, y, w, h, 2, (Fl_Color)g['A']); ++ draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g[(uchar)'N']); ++ draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g[(uchar)'H']); ++ draw(UPPER_LEFT, x, y, w, h, 0, (Fl_Color)g[(uchar)'N']); ++ draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g[(uchar)'H']); ++ draw(LOWER_RIGHT, x, y, w, h, 0, (Fl_Color)g[(uchar)'S']); ++ draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g[(uchar)'U']); ++ draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g[(uchar)'U']); ++ draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g[(uchar)'W']); ++ draw(CLOSED, x, y, w, h, 2, (Fl_Color)g[(uchar)'A']); + } + + void fl_round_up_box(int x, int y, int w, int h, Fl_Color bgcolor) { + uchar *g = fl_gray_ramp(); + draw(FILL, x, y, w, h, 2, bgcolor); +- draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g['H']); +- draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g['N']); +- draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g['H']); +- draw(LOWER_RIGHT, x, y, w, h, 2, (Fl_Color)g['N']); +- draw(UPPER_LEFT, x, y, w, h, 2, (Fl_Color)g['U']); +- draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g['S']); +- draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g['W']); +- draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g['U']); +- draw(CLOSED, x, y, w, h, 0, (Fl_Color)g['A']); ++ draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g[(uchar)'H']); ++ draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g[(uchar)'N']); ++ draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g[(uchar)'H']); ++ draw(LOWER_RIGHT, x, y, w, h, 2, (Fl_Color)g[(uchar)'N']); ++ draw(UPPER_LEFT, x, y, w, h, 2, (Fl_Color)g[(uchar)'U']); ++ draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g[(uchar)'S']); ++ draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g[(uchar)'W']); ++ draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g[(uchar)'U']); ++ draw(CLOSED, x, y, w, h, 0, (Fl_Color)g[(uchar)'A']); + } + + extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*); +--- fltk-1.3.2/jpeg/jmorecfg.h.orig 2013-07-19 08:48:14.000000000 -0400 ++++ fltk-1.3.2/jpeg/jmorecfg.h 2013-07-19 08:50:50.000000000 -0400 +@@ -232,14 +232,15 @@ + * Defining HAVE_BOOLEAN before including jpeglib.h should make it work. + */ + +-#ifndef HAVE_BOOLEAN +-typedef int boolean; +-#endif +-#ifndef FALSE /* in case these macros already exist */ +-#define FALSE 0 /* values of boolean */ ++#ifdef HAVE_BOOLEAN ++#ifndef FALSE /* in case these macros already exist */ ++#define FALSE 0 /* values of boolean */ + #endif + #ifndef TRUE +-#define TRUE 1 ++#define TRUE 1 ++#endif ++#else ++typedef enum { FALSE = 0, TRUE = 1 } boolean; + #endif + + +--- fltk-1.3.2/src/Fl_JPEG_Image.cxx.orig 2013-07-19 08:46:16.000000000 -0400 ++++ fltk-1.3.2/src/Fl_JPEG_Image.cxx 2013-07-19 08:59:15.000000000 -0400 +@@ -155,7 +155,7 @@ + + jpeg_create_decompress(&dinfo); + jpeg_stdio_src(&dinfo, fp); +- jpeg_read_header(&dinfo, 1); ++ jpeg_read_header(&dinfo, TRUE); + + dinfo.quantize_colors = (boolean)FALSE; + dinfo.out_color_space = JCS_RGB; +@@ -333,7 +333,7 @@ + + jpeg_create_decompress(&dinfo); + jpeg_mem_src(&dinfo, data); +- jpeg_read_header(&dinfo, 1); ++ jpeg_read_header(&dinfo, TRUE); + + dinfo.quantize_colors = (boolean)FALSE; + dinfo.out_color_space = JCS_RGB; Index: fltk13-aqua.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/fltk13-aqua.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- fltk13-aqua.info 5 Apr 2013 22:22:24 -0000 1.8 +++ fltk13-aqua.info 22 Jul 2013 14:30:56 -0000 1.9 @@ -1,6 +1,6 @@ Package: fltk13-aqua Version: 1.3.2 -Revision: 1 +Revision: 3 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net> # Description: GUI toolkit (Aqua graphics) @@ -38,13 +38,17 @@ Don't continue if any make target fails. Patch to avoid chmod +x on libraries. + +Patch to always pass uchar to array indices. + +Patch for libjpeg9 as described in http://www.fltk.org/str.php?L2920. << # Homepage: http://www.fltk.org/ License: LGPL # -BuildDepends: libjpeg8, libpng15, fink ( >= 0.25.0 ) -Depends: %N-shlibs, macosx, libjpeg8-shlibs, libpng15-shlibs +BuildDepends: libjpeg9, libpng16, fink ( >= 0.25.0 ) +Depends: %N-shlibs, macosx, libjpeg9-shlibs, libpng16-shlibs Conflicts: fltk-x11, fltk, fltk-aqua, fltk13-x11 Replaces: fltk-x11, fltk, fltk-aqua, fltk13-x11 BuildDependsOnly: true @@ -57,7 +61,7 @@ Source-MD5: 9f7e707d4fb7a5a76f0f9b73ff70623d # PatchFile: %n.patch -PatchFile-MD5: 00de968a4dab51faf71cc785ff37363f +PatchFile-MD5: 256a53c162001dd0c815eac4b91f8b1b PatchScript: << #!/bin/sh -ev sed 's|@FINKPREFIX@|%p|' %{PatchFile} | patch -p1 @@ -97,7 +101,7 @@ # Splitoff: << Package: %N-shlibs -Depends: libjpeg8-shlibs, libpng15-shlibs, macosx +Depends: libjpeg9-shlibs, libpng16-shlibs, macosx Conflicts: fltk Replaces: fltk BuildDependsOnly: false ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs