From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sat, 31 Mar 2007 17:50:14 +0000 (+0000)
Subject: Fix building with libggi-2.2.2, patch from bug 126400 by Kimura Masaru.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f574cd57bf2c300f01a8b7ac41be8f835ba0bce;p=gentoo.git

Fix building with libggi-2.2.2, patch from bug 126400 by Kimura Masaru.
Package-Manager: portage-2.1.2.3
---

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 40c44ea09859..48979df8f1da 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.10 2007/02/26 14:22:33 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.11 2007/03/31 17:50:14 drac Exp $
+
+  31 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  +files/gnuplot-4.0-libggi.patch, gnuplot-4.0-r2.ebuild:
+  Fix building with libggi-2.2.2, patch from bug 126400 by Kimura Masaru.
 
 *gnuplot-4.0-r2 (26 Feb 2007)
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index c8e39c141078..400bfd16beb9 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -6,6 +6,10 @@ AUX gnuplot-4.0-filled-arrow.patch 1349 RMD160 99c620fda889773a4814726e339e51095
 MD5 7af7e5f057531526e6c3447bf18c2ed8 files/gnuplot-4.0-filled-arrow.patch 1349
 RMD160 99c620fda889773a4814726e339e51095924a38b files/gnuplot-4.0-filled-arrow.patch 1349
 SHA256 aa3adb859e5ed943d948e8817e24b9f3e391411684ca4bdea5485374d976e652 files/gnuplot-4.0-filled-arrow.patch 1349
+AUX gnuplot-4.0-libggi.patch 8426 RMD160 db33b7eb0567f9ae7f8a35acd8c64df6ebb3b330 SHA1 f4f79c4d49430ff50d00d6e0b15bacec1c5309a3 SHA256 6214ec1a19417febf2cb1e068924762706859b1392719ad497bccb98a6bc1bab
+MD5 90a70f64e3230aaa6bdeca743f16a85a files/gnuplot-4.0-libggi.patch 8426
+RMD160 db33b7eb0567f9ae7f8a35acd8c64df6ebb3b330 files/gnuplot-4.0-libggi.patch 8426
+SHA256 6214ec1a19417febf2cb1e068924762706859b1392719ad497bccb98a6bc1bab files/gnuplot-4.0-libggi.patch 8426
 AUX header-order.patch 1692 RMD160 d9b45d996958e41b7b4bbc9d33cdb1018f718dc4 SHA1 2e59302f469c31ee14bbe6b2f1658e571342e7e9 SHA256 d0feb2cd13afae70d558fd3c4d1284383e7ccb4d1d14527d9564ffe0e9b0d7c1
 MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692
 RMD160 d9b45d996958e41b7b4bbc9d33cdb1018f718dc4 files/header-order.patch 1692
@@ -20,18 +24,18 @@ EBUILD gnuplot-4.0-r1.ebuild 4024 RMD160 6875be3106bcb5b23098ae80e21fcdabe6dace9
 MD5 01fcd026f9b6d91db8dd3e9154f7b431 gnuplot-4.0-r1.ebuild 4024
 RMD160 6875be3106bcb5b23098ae80e21fcdabe6dace93 gnuplot-4.0-r1.ebuild 4024
 SHA256 8a95ffa9f7942c7504d34dbc256244e908431198c7dab7656688af310dc2be4b gnuplot-4.0-r1.ebuild 4024
-EBUILD gnuplot-4.0-r2.ebuild 4085 RMD160 ef7be3047c597b16c55d0d834b97bf895683916e SHA1 27f650f6fc6e123e64fa226b9d5733ba8293f517 SHA256 e5c6d17bb455441aea5229de02dcf9224cdd1a3b357a1fc40104b1120280c073
-MD5 d5fee3756e6485d2d0be508b7944adfc gnuplot-4.0-r2.ebuild 4085
-RMD160 ef7be3047c597b16c55d0d834b97bf895683916e gnuplot-4.0-r2.ebuild 4085
-SHA256 e5c6d17bb455441aea5229de02dcf9224cdd1a3b357a1fc40104b1120280c073 gnuplot-4.0-r2.ebuild 4085
+EBUILD gnuplot-4.0-r2.ebuild 4121 RMD160 47cba5b17283cb00cd6035d7f9cd8613578bb69a SHA1 be5dc4be32db95b21b27e47044fe5fd2efe0e68b SHA256 f680e93d2fa19a3cbc1801cb965062ac2065e06837bddce8e16b245334488b3f
+MD5 9effa0ca0bd7e2336c35afb29b1e060c gnuplot-4.0-r2.ebuild 4121
+RMD160 47cba5b17283cb00cd6035d7f9cd8613578bb69a gnuplot-4.0-r2.ebuild 4121
+SHA256 f680e93d2fa19a3cbc1801cb965062ac2065e06837bddce8e16b245334488b3f gnuplot-4.0-r2.ebuild 4121
 EBUILD gnuplot-4.2_rc1.ebuild 4308 RMD160 7047e292699a827491fecee14289558b911f6c77 SHA1 522be7776d9861c0cc4b6ebff7bec3ab13e11ed9 SHA256 a98f4fdf404a114f759ab768d6565342acb366859735d2530992ce349f2a6b85
 MD5 e317b725ca9c98be42b5bdee4fe42050 gnuplot-4.2_rc1.ebuild 4308
 RMD160 7047e292699a827491fecee14289558b911f6c77 gnuplot-4.2_rc1.ebuild 4308
 SHA256 a98f4fdf404a114f759ab768d6565342acb366859735d2530992ce349f2a6b85 gnuplot-4.2_rc1.ebuild 4308
-MISC ChangeLog 8026 RMD160 6a534f8b3eb968803b4bc42a4acb9409a2bee6ee SHA1 408e6a1d6a0768ce21a9d6d16cd35a2df9b28940 SHA256 49d1a2b429f5dd54a3ae2bc539b11e5ddb0d5144dedfb91708ed1aad841ce810
-MD5 234c924fe7839c5813e1df0bfe3c0608 ChangeLog 8026
-RMD160 6a534f8b3eb968803b4bc42a4acb9409a2bee6ee ChangeLog 8026
-SHA256 49d1a2b429f5dd54a3ae2bc539b11e5ddb0d5144dedfb91708ed1aad841ce810 ChangeLog 8026
+MISC ChangeLog 8204 RMD160 7b55e377ebd21dc32603d23fa5707090d45d3a7e SHA1 75e50de49069e0a1482d7ca3eb6335e35b36ab94 SHA256 dcae8982515ecb8346c1a510bf639746a7c15fb62ebe5182f272d928ce58a085
+MD5 44fb3adcf2a2f5ed8e09fa812d009897 ChangeLog 8204
+RMD160 7b55e377ebd21dc32603d23fa5707090d45d3a7e ChangeLog 8204
+SHA256 dcae8982515ecb8346c1a510bf639746a7c15fb62ebe5182f272d928ce58a085 ChangeLog 8204
 MISC metadata.xml 220 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee SHA1 e3b505cf1accaf86c17fdc78a3c98b08917d56ee SHA256 bcdae0f0c39207d696ad66e9c264b241cc25453afeadc3f6eb194a7e4452f770
 MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220
 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee metadata.xml 220
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch b/sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch
new file mode 100644
index 000000000000..af4bda970e2b
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.0-libggi.patch
@@ -0,0 +1,352 @@
+--- 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,&current_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/gnuplot-4.0-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild
index ef439a5c3483..73e83e35528b 100644
--- a/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild,v 1.1 2007/02/26 14:22:33 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild,v 1.2 2007/03/31 17:50:14 drac Exp $
 
 inherit eutils elisp-common
 
@@ -38,6 +38,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/header-order.patch
 	epatch "${FILESDIR}"/pdflib-6-compat.patch
 	epatch "${FILESDIR}"/${P}-filled-arrow.patch
+	epatch "${FILESDIR}"/${P}-libggi.patch
 }
 
 src_compile() {