[gentoo-commits] repo/gentoo:master commit in: media-gfx/tgif/files/, media-gfx/tgif/
commit: f2f9718f1989903363410e628354bc286b2d7cd2
Author: Sam James gentoo org>
AuthorDate: Thu Dec 1 02:16:36 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 1 03:41:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2f9718f
media-gfx/tgif: fix build w/ clang 16
Technically no need to revbump wrt the patch because all
the types were an int in the end, but doing it for the EAPI
8 part.
Closes: https://bugs.gentoo.org/881325
Signed-off-by: Sam James gentoo.org>
media-gfx/tgif/files/tgif-4.2.5-implicit-int.patch | 153 +
.../{tgif-4.2.5-r2.ebuild => tgif-4.2.5-r3.ebuild} | 30 ++--
2 files changed, 173 insertions(+), 10 deletions(-)
diff --git a/media-gfx/tgif/files/tgif-4.2.5-implicit-int.patch
b/media-gfx/tgif/files/tgif-4.2.5-implicit-int.patch
new file mode 100644
index ..60a0ca2175ad
--- /dev/null
+++ b/media-gfx/tgif/files/tgif-4.2.5-implicit-int.patch
@@ -0,0 +1,153 @@
+https://bugs.gentoo.org/881325
+https://bugzilla.redhat.com/show_bug.cgi?id=2148487
+https://src.fedoraproject.org/rpms/tgif/blob/ba3fa76ca8fde5c83569a703b849c8921923712f/f/tgif-c99.patch
+--- a/exec.c
b/exec.c
+@@ -518,6 +518,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));
+--- a/file.c
b/file.c
+@@ -4725,6 +4725,7 @@ int LoadFile(FullName, ObjFile, GzippedObjFile)
+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];
+--- a/import.c
b/import.c
+@@ -1373,7 +1373,7 @@ int ConvertGifToPpm6(pszGifPath, pszPpm6Path,
ppm6_path_sz)
+ 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;
+--- a/polygon.c
b/polygon.c
+@@ -1007,7 +1007,7 @@ void ContinueForStructSplinePolygonControlPoints(OrigX,
OrigY, LastX, LastY,
+ 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;
+--- a/rect.c
b/rect.c
+@@ -37,7 +37,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;
+
+--- a/ruler.c
b/ruler.c
+@@ -510,6 +510,7 @@ void DrawHRuleTick(XOff)
+
+ static
+ void DrawVRuleTick(YOff)
++int YOff;
+ {
+XDrawLine(mainDisplay, vRuleWindow, revDefaultGC, 0, YOff, rulerLen, YOff);
+ }
+--- a/scroll.c
b/scroll.c
+@@ -153,7 +153,8 @@ int TgPressButtonLoop(dpy, win, pbbox, psbci)
+
+ 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);
+@@ -211,7 +212,7 @@ void TgDrawScrollBar(dpy, win, orientation, x_off, y_off,
scroll_area_w,
+ 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);
+--- a/spline.c
b/spline.c
+@@ -795,7 +795,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;
+ {
+--- a/stretch.c
b/stretch.c
+@@ -4247,7 +4247,7 @@ void SizeAnObj(ObjPtr, TopOwner, AbsW, AbsH)
+
+ 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;
+--- a/tdgtbtn.c
b/tdgtbtn.c
+@@ -491,7 +491,7 @@ TdgtBtn
[gentoo-commits] repo/gentoo:master commit in: media-gfx/tgif/
commit: 42ad8d45b13181839bb307a805633fe88093486b
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Jan 6 14:06:08 2021 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Jan 6 14:06:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ad8d45
media-gfx/tgif: drop x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
media-gfx/tgif/tgif-4.2.5-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/tgif/tgif-4.2.5-r2.ebuild
b/media-gfx/tgif/tgif-4.2.5-r2.ebuild
index e65052ca190..8bed9267886 100644
--- a/media-gfx/tgif/tgif-4.2.5-r2.ebuild
+++ b/media-gfx/tgif/tgif-4.2.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="ftp://bourbon.usc.edu/pub/${PN}/${MY_P}.tar.gz;
LICENSE="QPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND="sys-libs/zlib
[gentoo-commits] repo/gentoo:master commit in: media-gfx/tgif/
commit: 314d7f78bdd0c13ff56f29ffbdb6a839d6f368b4
Author: Matt Turner gentoo org>
AuthorDate: Sat Apr 28 01:05:47 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Apr 28 01:07:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314d7f78
media-gfx/tgif: Drop unnecessary x11-proto dep
media-gfx/tgif/{tgif-4.2.5-r1.ebuild => tgif-4.2.5-r2.ebuild} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/media-gfx/tgif/tgif-4.2.5-r1.ebuild
b/media-gfx/tgif/tgif-4.2.5-r2.ebuild
similarity index 96%
rename from media-gfx/tgif/tgif-4.2.5-r1.ebuild
rename to media-gfx/tgif/tgif-4.2.5-r2.ebuild
index f73da72be33..e65052ca190 100644
--- a/media-gfx/tgif/tgif-4.2.5-r1.ebuild
+++ b/media-gfx/tgif/tgif-4.2.5-r2.ebuild
@@ -22,8 +22,7 @@ DEPEND="sys-libs/zlib
x11-libs/libX11
x11-libs/libXext
x11-libs/libXmu
- x11-libs/libXt
- x11-proto/xproto"
+ x11-libs/libXt"
RDEPEND="${DEPEND}
media-libs/netpbm"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/tgif/
commit: 687398653d1dd0ad75e1e7897110ca00ef14794a
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Apr 8 16:49:59 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Apr 8 22:41:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68739865
media-gfx/tgif: remove old.
media-gfx/tgif/tgif-4.2.5.ebuild | 45
1 file changed, 45 deletions(-)
diff --git a/media-gfx/tgif/tgif-4.2.5.ebuild b/media-gfx/tgif/tgif-4.2.5.ebuild
deleted file mode 100644
index db08aabc841..000
--- a/media-gfx/tgif/tgif-4.2.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils flag-o-matic
-
-MY_P="${PN}-QPL-${PV}"
-
-DESCRIPTION="Xlib base 2-D drawing facility under X11"
-HOMEPAGE="http://bourbon.usc.edu/tgif/index.html;
-SRC_URI="ftp://bourbon.usc.edu/pub/${PN}/${MY_P}.tar.gz;
-
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- x11-proto/xproto"
-RDEPEND="${DEPEND}
- media-libs/netpbm"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog HISTORY NEWS README )
-
-src_prepare() {
- sed -i \
- -e 's/^CFLAGS=/CFLAGS+=/' \
- -e 's:^TGIFDIR.*:TGIFDIR = $(datadir)/tgif:' \
- Makefile.am || die 'sed on Makefile.am failed'
-
- append-cppflags -D_DONT_USE_MKTEMP -DHAS_STREAMS_SUPPORT
-
- autotools-utils_src_prepare
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/tgif/files/, media-gfx/tgif/
commit: a83a4636502a9e22e64053a90a010cafc376c713
Author: David Seifert gentoo org>
AuthorDate: Mon Jan 25 09:32:29 2016 +
Commit: David Seifert gentoo org>
CommitDate: Mon Jan 25 09:52:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83a4636
media-gfx/tgif: Fix -Werror=format-security errors
Gentoo-Bug: 542132
* EAPI=6
* Fixed QA implicit declarations
Package-Manager: portage-2.2.27
.../tgif/files/tgif-4.2.5-wformat-security.patch | 500 +
media-gfx/tgif/tgif-4.2.5-r1.ebuild| 47 ++
2 files changed, 547 insertions(+)
diff --git a/media-gfx/tgif/files/tgif-4.2.5-wformat-security.patch
b/media-gfx/tgif/files/tgif-4.2.5-wformat-security.patch
new file mode 100644
index 000..5e16cb1
--- /dev/null
+++ b/media-gfx/tgif/files/tgif-4.2.5-wformat-security.patch
@@ -0,0 +1,500 @@
+Fix errors caused by -Wformat -Werror=format-security
+https://bugs.gentoo.org/show_bug.cgi?id=542132
+
+--- tgif-QPL-4.2.5/arc.c
tgif-QPL-4.2.5/arc.c
+@@ -2041,7 +2041,7 @@
+}
+
+if (dir == ARC_CCW && angle2 < 0) {
+- sprintf(gszMsgBox, TgLoadString(STID_WARN_INCONSIST_ARC_DIR));
++ sprintf(gszMsgBox, "%s", TgLoadString(STID_WARN_INCONSIST_ARC_DIR));
+ if (PRTGIF) {
+ fprintf(stderr, "%s\n", gszMsgBox);
+ } else {
+@@ -2050,7 +2050,7 @@
+ SetFileModified(TRUE);
+ dir = ARC_CW;
+} else if (dir == ARC_CW && angle2 > 0) {
+- sprintf(gszMsgBox, TgLoadString(STID_WARN_INCONSIST_ARC_DIR));
++ sprintf(gszMsgBox, "%s", TgLoadString(STID_WARN_INCONSIST_ARC_DIR));
+ if (PRTGIF) {
+ fprintf(stderr, "%s\n", gszMsgBox);
+ } else {
+--- tgif-QPL-4.2.5/auxtext.c
tgif-QPL-4.2.5/auxtext.c
+@@ -113,7 +113,7 @@
+if (canvasFontDoubleByte) {
+ sprintf(gszMsgBox, TgLoadString(STID_INPUT_OCTAL_STR), "\\244\\244");
+} else {
+- sprintf(gszMsgBox, TgLoadString(STID_INPUT_STR));
++ sprintf(gszMsgBox, "%s", TgLoadString(STID_INPUT_STR));
+}
+Dialog(gszMsgBox, TgLoadCachedString(CSTID_DLG_ACCEPT_CANCEL), szSpec);
+UtilTrimBlanks(szSpec);
+--- tgif-QPL-4.2.5/cutpaste.c
tgif-QPL-4.2.5/cutpaste.c
+@@ -200,7 +200,7 @@
+ lastKeyOrBtnEvInfo.time);
+if (XGetSelectionOwner(mainDisplay, XA_PRIMARY) != mainWindow) {
+ setselowner_failed = TRUE;
+- sprintf(gszMsgBox, TgLoadString(STID_CANT_ACQUIRE_X_SELECTION));
++ sprintf(gszMsgBox, "%s", TgLoadString(STID_CANT_ACQUIRE_X_SELECTION));
+ MsgBox(gszMsgBox, TOOL_NAME, INFO_MB);
+} else {
+ startSelectionOwnershipTimeValid = TRUE;
+@@ -349,10 +349,10 @@
+ MsgBox(gszMsgBox, TOOL_NAME, INFO_MB);
+} else {
+ if (!WriteBufToCutBuffer(cut_buffer, stat.st_size, FALSE, FALSE, NULL))
{
+- sprintf(gszMsgBox, TgLoadString(STID_COPY_FAILED_OBJ_MAYBE_TOO_BIG));
++ sprintf(gszMsgBox, "%s",
TgLoadString(STID_COPY_FAILED_OBJ_MAYBE_TOO_BIG));
+ MsgBox(gszMsgBox, TOOL_NAME, INFO_MB);
+ } else {
+- sprintf(gszMsgBox, TgLoadString(STID_COPY_BUFFER_UPDATED));
++ sprintf(gszMsgBox, "%s", TgLoadString(STID_COPY_BUFFER_UPDATED));
+ Msg(gszMsgBox);
+ }
+}
+--- tgif-QPL-4.2.5/drawing.c
tgif-QPL-4.2.5/drawing.c
+@@ -3339,7 +3339,7 @@
+
+SaveStatusStrings();
+if (*attr_ptr->attr_name.s == '\0') {
+- sprintf(title, TgLoadString(STID_EDIT_UNNAME_ATTR_DOTS));
++ sprintf(title, "%s", TgLoadString(STID_EDIT_UNNAME_ATTR_DOTS));
+ sprintf(cmd, gszEditorCmd, title, tfi.tmp_fname);
+ sprintf(gszMsgBox, TgLoadString(STID_EDIT_UNNAME_ATTR_WITH_CMD), cmd);
+} else {
+@@ -3460,7 +3460,7 @@
+}
+SaveStatusStrings();
+if (*attr_ptr->attr_name.s == '\0') {
+- sprintf(title, TgLoadString(STID_EDIT_UNNAME_ATTR_DOTS));
++ sprintf(title, "%s", TgLoadString(STID_EDIT_UNNAME_ATTR_DOTS));
+ sprintf(cmd, gszEditorCmd, title, tfi.tmp_fname);
+ sprintf(gszMsgBox, TgLoadString(STID_EDIT_UNNAME_ATTR_WITH_CMD), cmd);
+} else {
+--- tgif-QPL-4.2.5/edit.c
tgif-QPL-4.2.5/edit.c
+@@ -1138,7 +1138,7 @@
+ INFO_MB);
+ return;
+}
+- sprintf(gszMsgBox, TgLoadString(STID_VERTEX_AT_3_OCLOCK_YNC));
++ sprintf(gszMsgBox, "%s", TgLoadString(STID_VERTEX_AT_3_OCLOCK_YNC));
+if ((vertex_at_right=MsgBox(gszMsgBox, TOOL_NAME, YNC_MB)) ==
+ MB_ID_CANCEL) {
+ return;
+@@ -6104,7 +6104,7 @@
+ return;
+}
+if (CountObjectWithShadow() == 0) {
+- sprintf(gszMsgBox, TgLoadString(STID_NO_OBJ_SHADOW_FOUND));
++ sprintf(gszMsgBox, "%s", TgLoadString(STID_NO_OBJ_SHADOW_FOUND));
+ MsgBox(gszMsgBox, TOOL_NAME, INFO_MB);
+ return;
+}
+--- tgif-QPL-4.2.5/eps.c
tgif-QPL-4.2.5/eps.c
+@@ -670,7 +670,7 @@
+ }
+ fclose(xbm_fp);
+ if (writeFileFailed) {
+-fprintf(stderr, TgLoadString(STID_FAIL_TO_WRITE_TO_STDOUT));
++fprintf(stderr, "%s",
