CVS commit: pkgsrc/graphics/tgif

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jun 18 08:44:33 UTC 2024

Modified Files:
        pkgsrc/graphics/tgif: distinfo
Added Files:
        pkgsrc/graphics/tgif/patches: patch-exec.c patch-file.c patch-import.c
            patch-polygon.c patch-rect.c patch-ruler.c patch-scroll.c
            patch-spline.c patch-stretch.c patch-tdgtbtn.c patch-tdgtlist.c
            patch-text.c

Log Message:
tgif: c99 fixes from Fedora


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/tgif/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/tgif/patches/patch-exec.c \
    pkgsrc/graphics/tgif/patches/patch-file.c \
    pkgsrc/graphics/tgif/patches/patch-import.c \
    pkgsrc/graphics/tgif/patches/patch-polygon.c \
    pkgsrc/graphics/tgif/patches/patch-rect.c \
    pkgsrc/graphics/tgif/patches/patch-ruler.c \
    pkgsrc/graphics/tgif/patches/patch-scroll.c \
    pkgsrc/graphics/tgif/patches/patch-spline.c \
    pkgsrc/graphics/tgif/patches/patch-stretch.c \
    pkgsrc/graphics/tgif/patches/patch-tdgtbtn.c \
    pkgsrc/graphics/tgif/patches/patch-tdgtlist.c \
    pkgsrc/graphics/tgif/patches/patch-text.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/tgif/distinfo
diff -u pkgsrc/graphics/tgif/distinfo:1.15 pkgsrc/graphics/tgif/distinfo:1.16
--- pkgsrc/graphics/tgif/distinfo:1.15  Tue Oct 26 10:47:21 2021
+++ pkgsrc/graphics/tgif/distinfo       Tue Jun 18 08:44:33 2024
@@ -1,5 +1,17 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 10:47:21 nia Exp $
+$NetBSD: distinfo,v 1.16 2024/06/18 08:44:33 markd Exp $
 
 BLAKE2s (tgif-4.2.5.tar.gz) = 3059cef60cc872e6c739e8f5cc28b27fc69feceb42befccca494bb8956ee09d2
 SHA512 (tgif-4.2.5.tar.gz) = ef9ff515193884ded920322abcd9e0f11cd99e55170ff74cf59ff57ee1429fa622a5c4152b95feb1d4bef96d7304e5fdcc4d80d4bbab159648678a6fe37c4fa8
 Size (tgif-4.2.5.tar.gz) = 3115237 bytes
+SHA1 (patch-exec.c) = 8f9a250ba9d179ab146c1eb545525e12920f6b6a
+SHA1 (patch-file.c) = 46c80d063a6d2d53453a5650f599b022a90e057f
+SHA1 (patch-import.c) = 4c261453821a09834c4481385d7cfc12c939caf8
+SHA1 (patch-polygon.c) = 63f30fc04c440be9043295aab7f5ced048019ad2
+SHA1 (patch-rect.c) = b3a0ff8ac752003c611568a2906c43d9b7ca7c07
+SHA1 (patch-ruler.c) = 765354fdbc8c8819f94f92c0185dd838fb281120
+SHA1 (patch-scroll.c) = 7bd1d0d31a08ba7bdf800a0309f11c37faffe23f
+SHA1 (patch-spline.c) = 62bf6807be3e8b25fb519d21300c135b0c1bc486
+SHA1 (patch-stretch.c) = 27ac231eadf01ebdfc6bf226a2e992f70ea688bc
+SHA1 (patch-tdgtbtn.c) = efcfaee3465e05961be4d7b1342160381761e594
+SHA1 (patch-tdgtlist.c) = e4d2b8fe856290b9dc97181df3c35c1b21c5f1a3
+SHA1 (patch-text.c) = e4730215cb675812fbbeab8490809c02b9aa6bd3

Added files:

Index: pkgsrc/graphics/tgif/patches/patch-exec.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-exec.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-exec.c   Tue Jun 18 08:44:33 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-exec.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora
+
+--- exec.c.orig        2011-05-18 22:41:20.000000000 +0000
++++ exec.c
+@@ -530,6 +530,7 @@ int AppendToTmpStr(psz)
+ 
+ int AppendToTmpStr2(psz1, psz2, tg2)
+    char *psz1, *psz2;
++   int tg2;
+ {
+    int len1=strlen(psz1), len2=strlen(psz2), rc=0;
+    char *psz=(char*)malloc((len1+len2+1)*sizeof(char));
Index: pkgsrc/graphics/tgif/patches/patch-file.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-file.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-file.c   Tue Jun 18 08:44:33 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-file.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- file.c.orig        2011-05-16 16:21:57.000000000 +0000
++++ file.c
+@@ -4737,6 +4737,7 @@ int LoadFile(FullName, ObjFile, GzippedO
+    int ObjFile; /* equals TRUE if the file is an OBJ file */
+                 /* equals FALSE if the file is a SYM or PIN file */
+                 /* equals -1 if the file is an temporary OBJ file */
++   int GzippedObjFile;
+ {
+    struct ObjRec *obj_ptr=NULL;
+    char tmp_filename[MAXPATHLENGTH+1], tmp_filefullpath[MAXPATHLENGTH+1];
Index: pkgsrc/graphics/tgif/patches/patch-import.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-import.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-import.c Tue Jun 18 08:44:33 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-import.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- import.c.orig      2011-06-14 03:30:36.000000000 +0000
++++ import.c
+@@ -1385,7 +1385,7 @@ int ConvertGifToPpm6(pszGifPath, pszPpm6
+ static
+ int FinishImport(remote_file, remote_tmp_fname, local_fname, which, pn_image_w,
+       pn_image_h)
+-   int remote_file, *pn_image_w, *pn_image_h;
++   int remote_file, which, *pn_image_w, *pn_image_h;
+    char *remote_tmp_fname, *local_fname;
+ {
+    char xpm_fname[MAXPATHLENGTH+1], *rest=NULL, *psz_format=NULL;
Index: pkgsrc/graphics/tgif/patches/patch-polygon.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-polygon.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-polygon.c        Tue Jun 18 08:44:33 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-polygon.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- polygon.c.orig     2011-06-09 16:25:07.000000000 +0000
++++ polygon.c
+@@ -1020,7 +1020,7 @@ void ContinueForStructSplinePolygonContr
+ static
+ void EraseStructSplineLinesForContAndUpdateSvs(OrigX, OrigY, grid_x, grid_y,
+       pev, num_pts, psv, sn, psv2, sn2, pipt_prev, pipt_first)
+-   int OrigX, OrigY, grid_x, grid_y, sn, sn2;
++   int OrigX, OrigY, grid_x, grid_y, num_pts, sn, sn2;
+    XEvent *pev;
+    XPoint **psv, **psv2;
+    IntPointTriplet *pipt_prev, *pipt_first;
Index: pkgsrc/graphics/tgif/patches/patch-rect.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-rect.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-rect.c   Tue Jun 18 08:44:33 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-rect.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- rect.c.orig        2011-05-16 16:21:59.000000000 +0000
++++ rect.c
+@@ -50,7 +50,7 @@
+ 
+ void DumpRectPath(FP, LtX, LtY, RbX, RbY, Indent, LastLF)
+    FILE *FP;
+-   int LtX, LtY, RbX, RbY, Indent;
++   int LtX, LtY, RbX, RbY, Indent, LastLF;
+ {
+    register int i;
+ 
Index: pkgsrc/graphics/tgif/patches/patch-ruler.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-ruler.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-ruler.c  Tue Jun 18 08:44:33 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-ruler.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- ruler.c.orig       2011-05-16 16:21:59.000000000 +0000
++++ ruler.c
+@@ -523,6 +523,7 @@ void DrawHRuleTick(XOff)
+ 
+ static
+ void DrawVRuleTick(YOff)
++    int YOff;
+ {
+    XDrawLine(mainDisplay, vRuleWindow, revDefaultGC, 0, YOff, rulerLen, YOff);
+ }
Index: pkgsrc/graphics/tgif/patches/patch-scroll.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-scroll.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-scroll.c Tue Jun 18 08:44:33 2024
@@ -0,0 +1,25 @@
+$NetBSD: patch-scroll.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- scroll.c.orig      2011-05-16 16:21:59.000000000 +0000
++++ scroll.c
+@@ -165,7 +165,8 @@ int TgPressButtonLoop(dpy, win, pbbox, p
+ 
+ int TgGetScrollHit(x, y, orientation, scroll_area_w, scroll_area_h,
+       start_frac, length, total, pn_btn_offset)
+-   int x, y, scroll_area_w, scroll_area_h, length, total, *pn_btn_offset;
++   int x, y, orientation, scroll_area_w, scroll_area_h, length, total,
++      *pn_btn_offset;
+    double start_frac;
+ {
+    int block_start=0, block_size=0, min_block_size=1+(windowPadding<<1);
+@@ -223,7 +224,7 @@ void TgDrawScrollBar(dpy, win, orientati
+       scroll_area_h, start_frac, length, total)
+    Display *dpy;
+    Window win;
+-   int x_off, y_off, scroll_area_w, scroll_area_h, length, total;
++   int orientation, x_off, y_off, scroll_area_w, scroll_area_h, length, total;
+    double start_frac;
+ {
+    int block_start=0, block_size=0, min_block_size=1+(windowPadding<<1);
Index: pkgsrc/graphics/tgif/patches/patch-spline.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-spline.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-spline.c Tue Jun 18 08:44:33 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-spline.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- spline.c.orig      2011-05-16 16:21:59.000000000 +0000
++++ spline.c
+@@ -808,7 +808,7 @@ typedef struct MultiSplineRec {
+ } *MultiSplineRecPtr;
+ 
+ XPoint *MakeMultiSplinePolyVertex(Curved, N, Smooth, XOff, YOff, NumVs, Vs)
+-   int *N, XOff, YOff, NumVs;
++   int Curved, *N, XOff, YOff, NumVs;
+    char *Smooth;
+    IntPoint *Vs;
+ {
Index: pkgsrc/graphics/tgif/patches/patch-stretch.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-stretch.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-stretch.c        Tue Jun 18 08:44:33 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-stretch.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- stretch.c.orig     2011-05-16 16:21:59.000000000 +0000
++++ stretch.c
+@@ -4260,7 +4260,7 @@ void SizeAnObj(ObjPtr, TopOwner, AbsW, A
+ 
+ static
+ void DoSizeAllSelToGivenWidthHeight(abs_w, abs_h, do_width, do_height)
+-   int abs_h, do_width, do_height;
++   int abs_w, abs_h, do_width, do_height;
+ {
+    struct SelRec *saved_top_sel=topSel, *saved_bot_sel=botSel, *sel_ptr=NULL;
+    int saved_h_align=horiAlign, saved_v_align=vertAlign, num_to_resize=0;
Index: pkgsrc/graphics/tgif/patches/patch-tdgtbtn.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-tdgtbtn.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-tdgtbtn.c        Tue Jun 18 08:44:33 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-tdgtbtn.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- tdgtbtn.c.orig     2011-05-16 16:22:00.000000000 +0000
++++ tdgtbtn.c
+@@ -504,7 +504,7 @@ TdgtBtn *CreateTdgtBtn(parent_win, paren
+       v_pad, btn_type, btn_style, state, font_style, str, pmosi)
+    Window parent_win;
+    TidgetInfo *parent_tidgetinfo;
+-   int ctl_id, x, y, w, h, h_pad, v_pad, state, font_style;
++   int ctl_id, x, y, w, h, h_pad, v_pad, btn_type, btn_style, state, font_style;
+    char *str;
+    MouseOverStatusInfo *pmosi;
+ {
Index: pkgsrc/graphics/tgif/patches/patch-tdgtlist.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-tdgtlist.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-tdgtlist.c       Tue Jun 18 08:44:33 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-tdgtlist.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- tdgtlist.c.orig    2011-05-16 16:22:00.000000000 +0000
++++ tdgtlist.c
+@@ -1052,7 +1052,8 @@ TdgtList *CreateTdgtList(parent_win, par
+       v_pad, num_visible_lines, can_select, multicolor, auto_scroll_on_insert)
+    Window parent_win;
+    TidgetInfo *parent_tidgetinfo;
+-   int ctl_id, x, y, w, h_pad, v_pad, num_visible_lines, auto_scroll_on_insert;
++   int ctl_id, x, y, w, h_pad, v_pad, num_visible_lines, can_select,
++      multicolor, auto_scroll_on_insert;
+ {
+    int bg_pixel=(threeDLook ? myLtGryPixel : myBgPixel), h=0, content_h=0;
+    TdgtList *pTdgtList=NULL;
Index: pkgsrc/graphics/tgif/patches/patch-text.c
diff -u /dev/null pkgsrc/graphics/tgif/patches/patch-text.c:1.1
--- /dev/null   Tue Jun 18 08:44:33 2024
+++ pkgsrc/graphics/tgif/patches/patch-text.c   Tue Jun 18 08:44:33 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-text.c,v 1.1 2024/06/18 08:44:33 markd Exp $
+
+c99 fixes from Fedora 
+
+--- text.c.orig        2011-06-14 02:24:15.000000000 +0000
++++ text.c
+@@ -2071,7 +2071,7 @@ void HandleClickOnText(drag, from_cursor
+       pressed_in_same_text, obj_ptr, double_clicked, saved_text_highlight,
+       skip_post_processing, click_time)
+    int drag, from_cursor_keys, x_off, y_off, pressed_in_same_text;
+-   int double_clicked, saved_text_highlight;
++   int double_clicked, saved_text_highlight, skip_post_processing;
+    struct ObjRec *obj_ptr;
+    Time click_time;
+ {
+@@ -4772,7 +4772,7 @@ int ReadTextLines(FP, ObjPtr, text_ptr,
+    char *color_str;
+    int num_lines, has_ps_bitmap, cur_sb_font, cur_db_font;
+    int double_byte, db_mod_bytes, db_vertical, direction;
+-   int x, baseline_y, *pn_max_len, *pn_max_h;
++   int x, baseline_y, text_w, *pn_max_len, *pn_max_h;
+    /*
+     * (Note: text_w is only used for fileVersion <= 36)
+     */