Attachment 218021 Details for Bug 249389 – patch wmglobe fix build on 13-CURRENT

[patch] patch wmglobe fix build on 13-CURRENT

wmglobe.diff (text/plain), 8.48 KB, created by jens_d on 2020-09-17 09:50:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jens_d

Created: 2020-09-17 09:50:19 UTC

Size: 8.48 KB

patch

obsolete

>diff -ruN wmglobe.old/Makefile wmglobe/Makefile
>--- wmglobe.old/Makefile	2020-09-17 11:13:13.340098000 +0200
>+++ wmglobe/Makefile	2020-09-17 10:40:42.528683000 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	wmglobe
> PORTVERSION=	1.3
>-PORTREVISION=	11
>+PORTREVISION=	12
> CATEGORIES=	astro windowmaker geography
> MASTER_SITES=	https://www.dockapps.net/download/
> 
>diff -ruN wmglobe.old/files/patch-src_myconvert.c wmglobe/files/patch-src_myconvert.c
>--- wmglobe.old/files/patch-src_myconvert.c	1970-01-01 01:00:00.000000000 +0100
>+++ wmglobe/files/patch-src_myconvert.c	2020-09-16 22:32:29.621981000 +0200
>@@ -0,0 +1,20 @@
>+--- src/myconvert.c.orig	2020-09-16 20:04:28 UTC
>++++ src/myconvert.c
>+@@ -253,7 +253,7 @@ static RXImage *image2PseudoColor(RContext * ctx, RIma
>+     const unsigned short bmask = rmask;
>+     unsigned short *rtable, *gtable, *btable;
>+     const int cpccpc = cpc * cpc;
>+-    unsigned char *data;
>++    char *data;
>+     int ofs;
>+     /*register unsigned char maxrgb = 0xff; */
>+ 
>+@@ -420,7 +420,7 @@ static RXImage *image2GrayScale(RContext * ctx, RImage
>+     const int cpc = ctx->attribs->colors_per_channel;
>+     unsigned short gmask;
>+     unsigned short *table;
>+-    unsigned char *data;
>++    char *data;
>+     int ofs;
>+     /*register unsigned char maxrgb = 0xff; */
>+ 
>diff -ruN wmglobe.old/files/patch-src_rend.c wmglobe/files/patch-src_rend.c
>--- wmglobe.old/files/patch-src_rend.c	1970-01-01 01:00:00.000000000 +0100
>+++ wmglobe/files/patch-src_rend.c	2020-09-15 16:31:53.376334000 +0200
>@@ -0,0 +1,23 @@
>+--- src/rend.c.orig	2020-09-15 14:31:47 UTC
>++++ src/rend.c
>+@@ -33,6 +33,20 @@
>+ 
>+ #include "wmglobe.h"
>+ 
>++/*
>++ * variables globales
>++ */
>++
>++double solu[DIAMETRE][DIAMETRE][3];
>++int tabsolu[DIAMETRE][DIAMETRE];
>++double moon_lat,moon_long;
>++struct timeval tlast, tnext, trend, tdelay, tini, tbase;
>++time_t tsunpos;
>++double center_dist;
>++double light_x, light_y, light_z;	/* vector of sunlight with lengt 1 */
>++double c_coef, b_coef;
>++int radius_proj, aml;
>++
>+ static RColor mygetMapColorLinear
>+     (double longitude, double latitude, double angle);
>+ 
>diff -ruN wmglobe.old/files/patch-src_wmglobe.c wmglobe/files/patch-src_wmglobe.c
>--- wmglobe.old/files/patch-src_wmglobe.c	1970-01-01 01:00:00.000000000 +0100
>+++ wmglobe/files/patch-src_wmglobe.c	2020-09-16 22:32:29.627411000 +0200
>@@ -0,0 +1,29 @@
>+--- src/wmglobe.c.orig	2001-08-12 15:41:22 UTC
>++++ src/wmglobe.c
>+@@ -35,7 +35,17 @@
>+ #include "defnimap.xpm"
>+ #endif
>+ 
>++/*
>++ * variables globales
>++ */
>+ 
>++Display *dpy;
>++Pixmap pix, pixmask;
>++XEvent Event;
>++RImage *map, *small, *mapnight;
>++Window iconwin, win;
>++GC NormalGC;
>++double marker[MAX_MARKERS][3];
>+ 
>+ 
>+ 
>+@@ -414,7 +424,7 @@ int main(int argc, char *argv[])
>+ 	    if (do_something) {
>+ 		if (!myRConvertImage(ctx, small, &pix)) {
>+ 		    fprintf(stderr, "crash !?\n");
>+-		    fprintf(stderr, RMessageForError(RErrorCode));
>++		    fprintf(stderr, "%s", RMessageForError(RErrorCode));
>+ 		    exit(1);
>+ 		}
>+ 		wmg.pixmap = pix;
>diff -ruN wmglobe.old/files/patch-src_wmglobe.h wmglobe/files/patch-src_wmglobe.h
>--- wmglobe.old/files/patch-src_wmglobe.h	1970-01-01 01:00:00.000000000 +0100
>+++ wmglobe/files/patch-src_wmglobe.h	2020-09-16 22:32:29.630105000 +0200
>@@ -0,0 +1,141 @@
>+--- src/wmglobe.h.orig	2001-08-12 15:41:22 UTC
>++++ src/wmglobe.h
>+@@ -34,7 +34,6 @@
>+ #include <ctype.h>		/*toupper */
>+ #include <stdarg.h>
>+ #include <time.h>
>+-#include <sys/timeb.h>
>+ #include <sys/time.h>
>+ #include <sys/types.h>
>+ #include <X11/Xlib.h>
>+@@ -83,17 +82,17 @@ typedef struct {
>+     int right;
>+ } MOUSE_REGION;
>+ 
>+-MOUSE_REGION mouse_region[MAX_MOUSE_REGION];
>++extern MOUSE_REGION mouse_region[MAX_MOUSE_REGION];
>+ 
>+ typedef struct MPO {
>+     int r, g, b;
>+ } MPO;
>+ 
>+-MPO *md[4], *mn[4];
>++extern MPO *md[4], *mn[4];
>+ 
>+-double solu[DIAMETRE][DIAMETRE][3];
>+-int tabsolu[DIAMETRE][DIAMETRE];
>+-int solution;
>++extern double solu[DIAMETRE][DIAMETRE][3];
>++extern int tabsolu[DIAMETRE][DIAMETRE];
>++extern int solution;
>+ 
>+ typedef struct {
>+     Pixmap pixmap;
>+@@ -102,72 +101,72 @@ typedef struct {
>+ } XpmIcon;
>+ 
>+ 
>+-Display *dpy;
>++extern Display *dpy;
>+ 
>+-char *dayfile, *nightfile, *dpy_name;
>++extern char *dayfile, *nightfile, *dpy_name;
>+ 
>+-Pixmap pix, pixmask;
>++extern Pixmap pix, pixmask;
>+ 
>+-XEvent Event;
>++extern XEvent Event;
>+ 
>+-RImage *map, *small, *mapnight;
>++extern RImage *map, *small, *mapnight;
>+ 
>+-XpmIcon screenpos, scrdate, scrdiv, numpix, txtpix, wmg;
>++extern XpmIcon screenpos, scrdate, scrdiv, numpix, txtpix, wmg;
>+ 
>+-Window iconwin, win;
>+-int onlyshape, option_iw;
>+-GC NormalGC;
>++extern Window iconwin, win;
>++extern int onlyshape, option_iw;
>++extern GC NormalGC;
>+ 
>+ /********* rendering********/
>+ 
>+ #if WITH_MARKERS
>+-double marker[MAX_MARKERS][3];
>+-int nb_marker, sun_marker, moon_marker;
>+-RColor sun_col, moon_col;
>+-double moon_lat,moon_long;
>++extern double marker[MAX_MARKERS][3];
>++extern int nb_marker, sun_marker, moon_marker;
>++extern RColor sun_col, moon_col;
>++extern double moon_lat,moon_long;
>+ #endif
>+ 
>+-double delay, time_multi;
>++extern double delay, time_multi;
>+ /*
>+  * struct timeval delta_tim, last_tim, next_tim, render_tim, base_tim,
>+  *  vec_tim;
>+  * 
>+  * time_t beg_time, ini_time,t1901;
>+  */
>+-struct timeval tlast, tnext, trend, tdelay, tini, tbase;
>+-time_t tsunpos;
>++extern struct timeval tlast, tnext, trend, tdelay, tini, tbase;
>++extern time_t tsunpos;
>+ 
>+-int sens, fun, funx, funy, oknimap, mratiox, mratioy, gotoscr;
>++extern int sens, fun, funx, funy, oknimap, mratiox, mratioy, gotoscr;
>+ 
>+-int typecadre, p_type, use_nightmap, use_default_nightmap, use_nmap_ini, 
>+-firstTime, stoprand, do_something, iop;
>++extern int typecadre, p_type, use_nightmap, use_default_nightmap,
>++       use_nmap_ini, firstTime, stoprand, do_something, iop;
>+ 
>+-double v_lat, v_long, old_dvlat, old_dvlong, dv_lat, dv_long;
>+-double dlat, dlong, addlat, addlong, ratiox, ratioy, dawn;
>++extern double v_lat, v_long, old_dvlat, old_dvlong, dv_lat, dv_long;
>++extern double dlat, dlong, addlat, addlong, ratiox, ratioy, dawn;
>+ 
>+-double sun_lat;
>+-double sun_long;
>++extern double sun_lat;
>++extern double sun_long;
>+ 
>+-double fov;
>+-double radius;
>+-double proj_dist;		/* distance to projection plane */
>++extern double fov;
>++extern double radius;
>++extern double proj_dist;		/* distance to projection plane */
>+ 
>+-double center_dist;		/*  distance to center of earth */
>++extern double center_dist;		/*  distance to center of earth */
>+ 
>+-double ambient_light;		/* how dark is the dark side? */
>++extern double ambient_light;		/* how dark is the dark side? */
>+ 
>+-double light_x, light_y, light_z;	/* vector of sunlight with lengt 1 */
>++extern double light_x, light_y, light_z;	/* vector of sunlight with lengt 1 */
>+ 
>+-double c_coef, b_coef;
>+-double zoom;
>+-int radius_proj, aml;		/* radius of sphere on screen */
>++extern double c_coef, b_coef;
>++extern double zoom;
>++extern int radius_proj, aml;		/* radius of sphere on screen */
>+ 
>+-RColor noir;
>++extern RColor noir;
>+ #ifdef DEBUG
>+-double minhz;
>++extern double minhz;
>+ #endif
>+ 
>+-int stable;
>++extern int stable;
>+ 
>+ /****************************************************************/
>+ /* Function Prototypes                                          */
>diff -ruN wmglobe.old/files/patch-src_wmgutil.c wmglobe/files/patch-src_wmgutil.c
>--- wmglobe.old/files/patch-src_wmgutil.c	1970-01-01 01:00:00.000000000 +0100
>+++ wmglobe/files/patch-src_wmgutil.c	2020-09-15 16:29:38.199439000 +0200
>@@ -0,0 +1,40 @@
>+--- src/wmgutil.c.orig	2020-09-15 14:29:30 UTC
>++++ src/wmgutil.c
>+@@ -32,6 +32,37 @@
>+ #include "scrtime.xpm"
>+ #include "scrdiv.xpm"
>+ 
>++/*
>++ * variables globales
>++ */
>++
>++MOUSE_REGION mouse_region[MAX_MOUSE_REGION];
>++MPO *md[4], *mn[4];
>++int solution;
>++char *dayfile, *nightfile, *dpy_name;
>++XpmIcon screenpos, scrdate, scrdiv, numpix, txtpix, wmg;
>++int onlyshape, option_iw;
>++int nb_marker, sun_marker, moon_marker;
>++RColor sun_col, moon_col;
>++double delay, time_multi;
>++int sens, fun, funx, funy, oknimap, mratiox, mratioy, gotoscr;
>++int typecadre, p_type, use_nightmap, use_default_nightmap, use_nmap_ini,
>++    firstTime, stoprand, do_something, iop;
>++double v_lat, v_long, old_dvlat, old_dvlong, dv_lat, dv_long;
>++double dlat, dlong, addlat, addlong, ratiox, ratioy, dawn;
>++double sun_lat;
>++double sun_long;
>++double fov;
>++double radius;
>++double proj_dist;		/* distance to projection plane */
>++double ambient_light;
>++double zoom;
>++RColor noir;
>++double minhz;
>++int stable;
>++
>++
>++
>+ static void move_earth(double vla, double vlo);
>+ static int flush_expose(Window w);
>+ static void mqparam();

Flags:

jd.fbsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 249389: 218021