diff options
Diffstat (limited to 'sci-visualization')
| -rw-r--r-- | sci-visualization/gnuplot/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/Manifest | 12 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch | 41 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch | 352 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/files/header-order.patch | 44 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/files/pdflib-6-compat.patch | 14 |
6 files changed, 10 insertions, 460 deletions
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog index eef4d213e671..f450f75d9d33 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-visualization/gnuplot # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.68 2008/04/24 12:19:54 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.69 2008/04/24 12:24:24 opfer Exp $ + + 24 Apr 2008; Christian Faulhammer <opfer@gentoo.org> + -files/gnuplot-4.0-filled-arrow.patch, -files/gnuplot-4.0-libggi.patch, + -files/pdflib-6-compat.patch, -files/header-order.patch: + clean up *gnuplot-4.2.3 (24 Apr 2008) diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index 02ae4863c1be..573ba103b953 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,22 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX gnuplot-4.0-filled-arrow.patch 1349 RMD160 99c620fda889773a4814726e339e51095924a38b SHA1 8a32dfc108e1a82fd013899a194f9a31e1e0ac0a SHA256 aa3adb859e5ed943d948e8817e24b9f3e391411684ca4bdea5485374d976e652 -AUX gnuplot-4.0-libggi.patch 8426 RMD160 db33b7eb0567f9ae7f8a35acd8c64df6ebb3b330 SHA1 f4f79c4d49430ff50d00d6e0b15bacec1c5309a3 SHA256 6214ec1a19417febf2cb1e068924762706859b1392719ad497bccb98a6bc1bab AUX gnuplot-4.2.0-libggi.patch 2437 RMD160 ef60c994bf2b34ca42a7e487a1fec89c01eb1530 SHA1 dc566b4c6406c135e2505132fca598ea52da7b24 SHA256 7263c8b22a2c7691e4cae85be6ea284846e4c5d328c894d174221cb2ffd3b3d3 AUX gnuplot-4.2.2-disable_texi_generation.patch 646 RMD160 ac2ed0785f72a6cc96ec10685f116a631ed80b78 SHA1 4d162a108fa2429d7aea49a416babc9b01124297 SHA256 922441e35ad4daefad70e3e2f7f1fe15b96f97d0b281f005eb70cd3130ad8f68 -AUX header-order.patch 1692 RMD160 d9b45d996958e41b7b4bbc9d33cdb1018f718dc4 SHA1 2e59302f469c31ee14bbe6b2f1658e571342e7e9 SHA256 d0feb2cd13afae70d558fd3c4d1284383e7ccb4d1d14527d9564ffe0e9b0d7c1 -AUX pdflib-6-compat.patch 560 RMD160 cb89ecb654a425925b34398a36cb83332fd438e2 SHA1 42d4bb19118e61730a82cabbf4fdbd59bb95c75d SHA256 b1745ad75b58f081b7c9d5dc204f58f519b283aa116e2791c93128026b45700f DIST gnuplot-4.2.2.tar.gz 2832174 RMD160 7364d283718d89c05652d7c25a841154caa2efd8 SHA1 991db8024f04e8cad300804bc2661e358fdcf348 SHA256 756f8a058f2743d0ca739a14bd43cda40d6fd9cc14bb50f4d30d92d538478a91 DIST gnuplot-4.2.3.tar.gz 2840611 RMD160 b4692db884c9da2f0d160f33f53c3d2aba65f36e SHA1 9f6239ef69ac5a6d68f40dc797f8a0b35b80f491 SHA256 4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4 EBUILD gnuplot-4.2.2-r1.ebuild 5158 RMD160 442c819f61991a8a8cbdd75580f0e5f104a3eca5 SHA1 2bd01833889569b706829e8135f351753d42765f SHA256 fbde8c23eef98d14346526b9275da2f0c530d4866676a234c29f384d6435c37a EBUILD gnuplot-4.2.3.ebuild 5170 RMD160 bb05c6646762b7fc51508f3b74abdd4b7d218efb SHA1 aa4735301325af7019fcc801e83a28f35e3cbfc6 SHA256 84a77672792e691b783ea09a2f0eab20085562e4aa5af30ab4878fb3d710ec3b -MISC ChangeLog 16894 RMD160 48262003b313aabb0f0e7e08e1ae32f070bebcee SHA1 9511092e4db340f9849533563de1ebfecf4ecfad SHA256 57266bfa74e70910c809f12a888cb64e06ac73ac7a5414621dcdcaa57bf3a1b3 +MISC ChangeLog 17094 RMD160 14f30abb8a1727d2c73725860de6d73dd438d4b3 SHA1 1af37e937454cdf63d13220a6b253e1f7260f238 SHA256 6262634b4a2ca188f2aede53da90b4c71c177786e2e7b47a119dbfb42ee6b291 MISC metadata.xml 217 RMD160 638a2f8a6696aef0ba64892bf3cd428a888546a3 SHA1 695d81d47b7947c020b99d5df45ad09930645c0a SHA256 28facc7a36b103a2edeb955f3dde1230ae5d5c8d02b786e1b39141b8c7341d9e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkgQevUACgkQNQqtfCuFneNEfwCgkbnCZhe3SF1mKxr8OOv4+YJK -6U4AoJOCVxjJ7+AUtwfr+I7og5ll4tuu -=egA7 +iEYEARECAAYFAkgQfBYACgkQNQqtfCuFneOWLgCgj7Y0+t89D7flwia8BXoAsDTZ +bp8An1FsBnPGbDEQG0m5MgHa4+L0UhnI +=2/1K -----END PGP SIGNATURE----- diff --git a/sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch b/sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch deleted file mode 100644 index f20970926355..000000000000 --- a/sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur gnuplot-4.0.0/src/term.c gnuplot-4.0.0-new/src/term.c ---- gnuplot-4.0.0/src/term.c 2004-04-13 13:24:02.000000000 -0400 -+++ gnuplot-4.0.0-new/src/term.c 2007-01-21 12:14:08.000000000 -0500 -@@ -927,7 +927,7 @@ - ym = (int) (dy2 + backlen * sin( phi + beta )); - } - #ifdef PM3D -- if (curr_arrow_headfilled==2) { -+ if (curr_arrow_headfilled==2 && !clip_point(ex,ey)) { - /* draw filled forward arrow head */ - filledhead[0].x = ex + xm; - filledhead[0].y = ey + ym; -@@ -939,7 +939,8 @@ - filledhead[3].y = ey + y2; - filledhead[4].x = ex + xm; - filledhead[4].y = ey + ym; -- (*t->filled_polygon) (5, filledhead); -+ if (t->filled_polygon) -+ (*t->filled_polygon) (5, filledhead); - } - #endif - /* draw outline of forward arrow head */ -@@ -956,7 +957,7 @@ - } - if (head == 2) { /* backward arrow head */ - #ifdef PM3D -- if (curr_arrow_headfilled==2) { -+ if (curr_arrow_headfilled==2 && !clip_point(sx,sy)) { - /* draw filled backward arrow head */ - filledhead[0].x = sx - xm; - filledhead[0].y = sy - ym; -@@ -968,7 +969,8 @@ - filledhead[3].y = sy - y2; - filledhead[4].x = sx - xm; - filledhead[4].y = sy - ym; -- (*t->filled_polygon) (5, filledhead); -+ if (t->filled_polygon) -+ (*t->filled_polygon) (5, filledhead); - } - #endif - /* draw outline of backward arrow head */ diff --git a/sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch b/sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch deleted file mode 100644 index af4bda970e2b..000000000000 --- a/sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch +++ /dev/null @@ -1,352 +0,0 @@ ---- gnuplot-4.0.0/term/ggi.trm.orig 2006-03-24 16:25:59.000000000 +0900 -+++ gnuplot-4.0.0/term/ggi.trm 2006-03-24 16:29:09.000000000 +0900 -@@ -116,9 +116,8 @@ - } GGI_vertex_t; - - TERM_PUBLIC long int GGI_SetTime(const struct timeval* current); --TERM_PUBLIC int GGI_from_keysym __PROTO((uint32 keysym)); --TERM_PUBLIC int GGI_from_button __PROTO((uint32 button)); --TERM_PUBLIC int GGI_y __PROTO((sint32 y)); -+TERM_PUBLIC int GGI_from_keysym __PROTO((uint32_t keysym)); -+TERM_PUBLIC int GGI_from_button __PROTO((uint32_t button)); - TERM_PUBLIC int GGI_dispatch_event __PROTO((const ggi_event* event)); - TERM_PUBLIC int GGI_eventually_update_modifiers __PROTO((const ggi_event* event, const int add)); - TERM_PUBLIC int GGI_waitforinput __PROTO((void)); -@@ -134,13 +133,13 @@ - TERM_PUBLIC void GGI_save_puts __PROTO((GGI_vertex_t* v, const int tag)); - TERM_PUBLIC void GGI_set_vertex __PROTO((GGI_vertex_t* v, const int x, const int y, const char* str, const int tag)); - TERM_PUBLIC void GGI_abort_zooming __PROTO((void)); --TERM_PUBLIC void GGI_put_tmptext __PROTO((int, const char str[])); --TERM_PUBLIC void GGI_relative __PROTO((int r[2])); -+TERM_PUBLIC void GGI_put_tmptext __PROTO((int, const char *str)); -+TERM_PUBLIC void GGI_relative __PROTO((int *r)); - TERM_PUBLIC void GGI_clear_hline __PROTO((int x1, int x2, int y)); - TERM_PUBLIC void GGI_clear_vline __PROTO((int y1, int y2, int x)); - TERM_PUBLIC void GGI_draw_hline __PROTO((int x1, int x2, int y)); - TERM_PUBLIC void GGI_draw_vline __PROTO((int y1, int y2, int x)); --TERM_PUBLIC void GGI_set_clipboard __PROTO((const char[])); -+TERM_PUBLIC void GGI_set_clipboard __PROTO((const char*)); - #endif /* USE_MOUSE */ - - #ifdef PM3D -@@ -488,8 +487,7 @@ - setvbuf(stdin, (char*)0, _IONBF, 0); - } - --TERM_PUBLIC void GGI_linetype(linetype) -- int linetype; -+TERM_PUBLIC void GGI_linetype(int linetype) - { - if(linetype==-2) ggiSetGCForeground(GGIvisual,GGIborderColor); - if(linetype==-1) ggiSetGCForeground(GGIvisual,GGIaxisColor); -@@ -498,11 +496,10 @@ - ggiSetGCForeground(GGIvisual,GGIcolors[linetype]); - } - --TERM_PUBLIC void GGI_move(x,y) -- unsigned int x,y; -+TERM_PUBLIC void GGI_move(unsigned int x, unsigned int y) - { - GGIx=x; -- GGIy=GGI_y(y); -+ GGIy=GGIymax - y; - } - - TERM_PUBLIC void -@@ -588,14 +585,12 @@ - #endif - } - --TERM_PUBLIC void GGI_put_text(x,y,str) -- unsigned int x,y; -- const char *str; -+TERM_PUBLIC void GGI_put_text(unsigned int x, unsigned int y, const char *str) - { - ggi_pixel current_foreground; - ggiGetGCForeground(GGIvisual,¤t_foreground); - ggiSetGCForeground(GGIvisual,GGIborderColor); -- ggiPuts(GGIvisual,x,GGI_y(y) - 4 /* ? (joze ? */,str); -+ ggiPuts(GGIvisual,x,GGIymax - y - 4 /* ? (joze ? */,str); - ggiSetGCForeground(GGIvisual,current_foreground); - } - -@@ -613,9 +608,7 @@ - } - - TERM_PUBLIC void --GGI_fillbox(style, x, y, w, h) --int style; --unsigned int x, y, w, h; -+GGI_fillbox(int style, unsigned int x, unsigned int y, unsigned int w, unsigned int h) - { - /* when is this called ? */ - /* ULIG: the style parameter is now used for the fillboxes style -@@ -644,10 +637,9 @@ - #endif - } - --TERM_PUBLIC void GGI_vector(x,y) -- unsigned int x,y; -+TERM_PUBLIC void GGI_vector(unsigned int x, unsigned int y) - { -- y = GGI_y(y); -+ y = GGIymax - y; - ggiDrawLine(GGIvisual,GGIx,GGIy,x,y); - GGIx=x; - GGIy=y; -@@ -657,8 +649,7 @@ - - /* tranlate ggi keysym to gnuplot keysym */ - TERM_PUBLIC int --GGI_from_keysym(keysym) -- uint32 keysym; -+GGI_from_keysym(uint32_t keysym) - { - switch (keysym) { - case GIIUC_BackSpace: -@@ -812,8 +803,7 @@ - } - - TERM_PUBLIC long int --GGI_SetTime(current) -- const struct timeval* current; -+GGI_SetTime(const struct timeval* current) - { - /* --> dsec in musec */ - int dsec = (current->tv_sec - GGI_timestamp.tv_sec) * 1000000; -@@ -824,8 +814,7 @@ - } - - TERM_PUBLIC int --GGI_from_button(button) -- uint32 button; -+GGI_from_button(uint32_t button) - { - switch (button) { - case GII_PBUTTON_LEFT: -@@ -841,16 +830,7 @@ - } - - TERM_PUBLIC int --GGI_y(y) -- sint32 y; --{ -- return GGIymax - y; --} -- --TERM_PUBLIC int --GGI_eventually_update_modifiers(event, add) -- const ggi_event* event; -- const int add; -+GGI_eventually_update_modifiers(const ggi_event* event, const int add) - { - int mod = 0; - int old_modifiers = GGI_modifiers; -@@ -882,7 +862,7 @@ - - gp_ev.type = GE_modifier; - gp_ev.mx = GGI_mouse_x; -- gp_ev.my = GGI_y(GGI_mouse_y); -+ gp_ev.my = GGIymax - GGI_mouse_y; - gp_ev.par1 = 0; - gp_ev.par2 = 0; - gp_ev.par1 = GGI_modifiers; -@@ -894,14 +874,13 @@ - } - - TERM_PUBLIC int --GGI_dispatch_event(event) -- const ggi_event* event; -+GGI_dispatch_event(const ggi_event* event) - { - struct gp_event_t gp_ev; - - gp_ev.type = 0; - gp_ev.mx = GGI_mouse_x; -- gp_ev.my = GGI_y(GGI_mouse_y); -+ gp_ev.my = GGIymax - GGI_mouse_y; - gp_ev.par1 = 0; - gp_ev.par2 = 0; - -@@ -1037,9 +1016,7 @@ - } - - TERM_PUBLIC void --GGI_clear(v, tag) -- const GGI_vertex_t* v; -- const int tag; -+GGI_clear(const GGI_vertex_t* v, const int tag) - { - if (tag && v->width) { - /* turn off current */ -@@ -1049,9 +1026,7 @@ - } - - TERM_PUBLIC void --GGI_save_puts(v, tag) -- GGI_vertex_t* v; -- const int tag; -+GGI_save_puts(GGI_vertex_t* v, const int tag) - { - GGI_clear(v, tag); - -@@ -1067,12 +1042,7 @@ - } - - TERM_PUBLIC void --GGI_set_vertex(v, x, y, str, tag) -- GGI_vertex_t* v; -- const int x; -- const int y; -- const char* str; -- const int tag; -+GGI_set_vertex(GGI_vertex_t* v, const int x, const int y, const char* str, const int tag) - { - GGI_clear(v, tag); - -@@ -1091,8 +1061,7 @@ - } - - TERM_PUBLIC void --GGI_relative(r) -- int r[2]; -+GGI_relative(int *r) - { - int diff = r[1] - r[0]; - if (diff < 0) { -@@ -1104,10 +1073,7 @@ - } - - TERM_PUBLIC void --GGI_clear_hline(x1, x2, y) -- int x1; -- int x2; -- int y; -+GGI_clear_hline(int x1, int x2, int y) - { - if (GGI_saved_canvas && x1 >= 0 && x2 >= 0 && y >= 0) { - int r[2]; -@@ -1122,10 +1088,7 @@ - } - - TERM_PUBLIC void --GGI_clear_vline(y1, y2, x) -- int y1; -- int y2; -- int x; -+GGI_clear_vline(int y1, int y2, int x) - { - if (GGI_saved_canvas && y1 >= 0 && y2 >= 0 && x >= 0) { - int r[2]; -@@ -1140,10 +1103,7 @@ - } - - TERM_PUBLIC void --GGI_draw_hline(x1, x2, y) -- int x1; -- int x2; -- int y; -+GGI_draw_hline(int x1, int x2, int y) - { - if (x1 >= 0 && x2 >= 0 && y >= 0) { - int r[2]; -@@ -1157,10 +1117,7 @@ - } - - TERM_PUBLIC void --GGI_draw_vline(y1, y2, x) -- int y1; -- int y2; -- int x; -+GGI_draw_vline(int y1, int y2, int x) - { - if (y1 >= 0 && y2 >= 0 && x >= 0) { - int r[2]; -@@ -1308,9 +1265,7 @@ - } - - TERM_PUBLIC void --GGI_put_tmptext(i, str) -- int i; -- const char str[]; -+GGI_put_tmptext(int i, const char *str) - { - char* second; - -@@ -1364,8 +1319,7 @@ - } - - TERM_PUBLIC void --GGI_set_ruler(x, y) -- int x, y; -+GGI_set_ruler(int x, int y) - { - if (x < 0) { - -@@ -1377,14 +1331,13 @@ - - } else { - GGI_ruler.x = x; -- GGI_ruler.y = GGI_y(y); -+ GGI_ruler.y = GGIymax - y; - } - GGI_needs_update++; - } - - TERM_PUBLIC void --GGI_set_cursor(c, x, y) -- int c, x, y; -+GGI_set_cursor(int c, int x, int y) - { - /* TODO */ - switch (c) { -@@ -1402,8 +1355,7 @@ - } - - TERM_PUBLIC void --GGI_set_clipboard(s) -- const char s[]; -+GGI_set_clipboard(const char *s) - { - /* XXX: not implemented */ - } -@@ -1411,8 +1363,7 @@ - - #ifdef PM3D - TERM_PUBLIC int --GGI_make_palette(palette) -- t_sm_palette *palette; -+GGI_make_palette(t_sm_palette *palette) - { - /* reallocate only, if it has changed */ - if (palette && (GGI_save_pal.colorFormulae < 0 -@@ -1454,8 +1405,7 @@ - } - - TERM_PUBLIC void --GGI_set_color(gray) -- double gray; -+GGI_set_color(double gray) - { - if (GGIvisual) { - int idx = (gray <= 0) ? 0 : (int)(gray * ggi_pm3d_colors); -@@ -1470,9 +1420,7 @@ - - #ifdef ENABLE_XMI - TERM_PUBLIC void --GGI_filled_polygon(points, corners) -- int points; -- gpiPoint *corners; -+GGI_filled_polygon(int points, gpiPoint *corners) - { - static miPoint offset = {0, 0}; - if (GGI_miPaintedSet) { -@@ -1485,7 +1433,7 @@ - } - for (i = 0; i < MI_POINTS; i++) { - mi_corners[i].x = corners[i].x; -- mi_corners[i].y = GGI_y(corners[i].y); -+ mi_corners[i].y = GGIymax - corners[i].y; - } - miFillPolygon(GGIvisual, GGI_miPaintedSet, GGI_miGC, - MI_SHAPE_GENERAL, MI_COORD_MODE_ORIGIN, MI_POINTS, mi_corners); diff --git a/sci-visualization/gnuplot/files/header-order.patch b/sci-visualization/gnuplot/files/header-order.patch deleted file mode 100644 index 82ba590fcb2b..000000000000 --- a/sci-visualization/gnuplot/files/header-order.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- src/term.h 2004-04-13 19:24:02.000000000 +0200 -+++ src/term.h.new 2004-05-05 11:16:41.216200736 +0200 -@@ -270,6 +270,20 @@ - /****************************************************************************/ - /* These terminals can be used on any system */ - -+/* NOTE THAT PNG AND JPEG SUPPORT REQUIRE SEPARATE LIBRARIES */ -+/* There are 2 flavors of PNG support */ -+/* If you are using an old version of libgd in order to get true GIF support */ -+/* then the best we can do is use a separate poor-quality PNG driver png.trm */ -+/* But if you are using a newer libgd then it provides full blown support */ -+/* for both PNG and JPEG in term/gd.trm */ -+#ifdef HAVE_LIBPNG -+# if defined(HAVE_GD_PNG) || defined(HAVE_GD_JPEG) -+# include "gd.trm" -+# else -+# include "png.trm" -+# endif -+#endif -+ - #ifdef X11 - # include "x11.trm" /* X Window System */ - # include "xlib.trm" /* dumps x11 commands to gpoutfile */ -@@ -351,20 +365,6 @@ - # include "pdf.trm" - #endif - --/* NOTE THAT PNG AND JPEG SUPPORT REQUIRE SEPARATE LIBRARIES */ --/* There are 2 flavors of PNG support */ --/* If you are using an old version of libgd in order to get true GIF support */ --/* then the best we can do is use a separate poor-quality PNG driver png.trm */ --/* But if you are using a newer libgd then it provides full blown support */ --/* for both PNG and JPEG in term/gd.trm */ --#ifdef HAVE_LIBPNG --# if defined(HAVE_GD_PNG) || defined(HAVE_GD_JPEG) --# include "gd.trm" --# else --# include "png.trm" --# endif --#endif -- - /* postscript */ - #include "post.trm" - diff --git a/sci-visualization/gnuplot/files/pdflib-6-compat.patch b/sci-visualization/gnuplot/files/pdflib-6-compat.patch deleted file mode 100644 index 3a25292d93d6..000000000000 --- a/sci-visualization/gnuplot/files/pdflib-6-compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN gnuplot-4.0.0.orig/term/pdf.trm gnuplot-4.0.0/term/pdf.trm ---- gnuplot-4.0.0.orig/term/pdf.trm 2004-04-10 08:55:17.000000000 -0700 -+++ gnuplot-4.0.0/term/pdf.trm 2005-05-24 15:33:52.000000000 -0700 -@@ -343,7 +343,9 @@ - myPDF = PDF_new(); - - /*open new PDF file */ -- if (PDF_open_fp(myPDF, gpoutfile) == -1) -+ /* HBB FIXME 20040708: PDF_open_file is deprecated, will have to -+ * be re-done again soon. */ -+ if (PDF_open_file(myPDF, outstr) == -1) - int_error(NO_CARET, "Error:cannot open PDF file .\n"); - - #ifdef PDF_DONT_COMPRESS |