From 896d6a8a88861c42b5d531a2f147c8a29a149bd8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 1 Dec 2022 20:53:45 +0000 Subject: gentoo auto-resync : 01:12:2022 - 20:53:45 --- media-gfx/tgif/Manifest | 3 +- media-gfx/tgif/files/tgif-4.2.5-implicit-int.patch | 153 +++++++++++++++++++++ media-gfx/tgif/tgif-4.2.5-r2.ebuild | 45 ------ media-gfx/tgif/tgif-4.2.5-r3.ebuild | 55 ++++++++ 4 files changed, 210 insertions(+), 46 deletions(-) create mode 100644 media-gfx/tgif/files/tgif-4.2.5-implicit-int.patch delete mode 100644 media-gfx/tgif/tgif-4.2.5-r2.ebuild create mode 100644 media-gfx/tgif/tgif-4.2.5-r3.ebuild (limited to 'media-gfx/tgif') diff --git a/media-gfx/tgif/Manifest b/media-gfx/tgif/Manifest index 4967f1c2dd6a..96cafabd4848 100644 --- a/media-gfx/tgif/Manifest +++ b/media-gfx/tgif/Manifest @@ -1,4 +1,5 @@ +AUX tgif-4.2.5-implicit-int.patch 5730 BLAKE2B 52d364f7af5df7d7cc4365320cbedc5405a96b2bd9072a3f516c00544035080412fa669e3a4a3ee168c170e54aaa48a671c11c2ac11b1ec5d94f244941adc2b6 SHA512 0f87964fa5a885dffcdd30a406b1310db8b8813054abe8b507fbfe497843ccc26769e8721904d1a28dee45e47f6db847832fd133ed4b59c04b9adc8759fe8147 AUX tgif-4.2.5-wformat-security.patch 19741 BLAKE2B 53633a5012d4f49bb42654c8237c4bee08fcac5525a69b0967f3fb2a7bdfe58d6a402f74d2af5505d876e9acfa1b3014ac1e7261b00f027b0e5b15c609ada0a8 SHA512 881ef034698a0e632c257a185346cb22218b93f8668fabf0169cb1a6c59ce0ad7a81ab5e4093610a3cbd360304a007067862d672622bed7a852db93f584d3d7f DIST tgif-QPL-4.2.5.tar.gz 3093619 BLAKE2B 8d858c357a7c51185ee22f0e2005bd4a7c96270c701bf603fd7e6bea012794892e460d5e9dfbfdbbc17a3e6accb5f4afbc3baadc4e3315e6dd5b4e676f1ce5bf SHA512 7b007620190883e30216407bf31c4142493bbd270b4babc282994dec37d221d79f0b1cadc9efda9bc337eb323254e69beee2d4c4873877e7321df41922f456ef -EBUILD tgif-4.2.5-r2.ebuild 913 BLAKE2B 36527a99c24ad76444424449f7474266d6c7c817740156a0507e994b736a03ebdaf9cb914fefa472f9977701af3bd025efbb784e8c993cd455359dead787a191 SHA512 260b5e4dec1f33a1cf3d01769fd052efeb25c4f226027429c363aea40f54004396a3effa1117ce04ce02e40a7c89661d53acb0669fcb50b99e8d1d397d6667f1 +EBUILD tgif-4.2.5-r3.ebuild 1021 BLAKE2B 5e3d4b2c13ae9b065a67d8d6feff4248382fe7b565e287497f8f18c4ee93e5be9fe23359f340507a6d7c77c9aed234f294a0278652fd10caff72660db184b688 SHA512 9e3e648b2fe9f44fcf8f35126c603a1b77791a01a2c1bd1a17049f53ece0798d325f1485661d296475c6effda54b847f51bff89f240f446c4dfd5c6903926cc8 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a 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 000000000000..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 *CreateTdgtBtn(parent_win, parent_tidgetinfo, ctl_id, x, y, w, h, h_pad, + 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; + { +--- a/tdgtlist.c ++++ b/tdgtlist.c +@@ -1039,7 +1039,8 @@ TdgtList *CreateTdgtList(parent_win, parent_tidgetinfo, ctl_id, x, y, w, h_pad, + 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; +--- a/text.c ++++ b/text.c +@@ -2059,7 +2059,7 @@ void HandleClickOnText(drag, from_cursor_keys, x_off, y_off, + 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; + { +@@ -4760,7 +4760,7 @@ int ReadTextLines(FP, ObjPtr, text_ptr, color_str, num_lines, has_ps_bitmap, + 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) + */ + diff --git a/media-gfx/tgif/tgif-4.2.5-r2.ebuild b/media-gfx/tgif/tgif-4.2.5-r2.ebuild deleted file mode 100644 index 8bed92678866..000000000000 --- a/media-gfx/tgif/tgif-4.2.5-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools 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" -IUSE="" - -DEPEND="sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt" -RDEPEND="${DEPEND} - media-libs/netpbm" - -PATCHES=( - "${FILESDIR}/${P}-wformat-security.patch" -) - -S="${WORKDIR}/${MY_P}" - -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 - - default - eautoreconf -} diff --git a/media-gfx/tgif/tgif-4.2.5-r3.ebuild b/media-gfx/tgif/tgif-4.2.5-r3.ebuild new file mode 100644 index 000000000000..64fe95e20c46 --- /dev/null +++ b/media-gfx/tgif/tgif-4.2.5-r3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools 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" +S="${WORKDIR}/${MY_P}" + +LICENSE="QPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +DEPEND=" + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt +" +RDEPEND=" + ${DEPEND} + media-libs/netpbm +" + +PATCHES=( + "${FILESDIR}/${P}-wformat-security.patch" + "${FILESDIR}/${P}-implicit-int.patch" +) + +src_prepare() { + default + + sed -i \ + -e 's/^CFLAGS=/CFLAGS+=/' \ + -e 's:^TGIFDIR.*:TGIFDIR = $(datadir)/tgif:' \ + Makefile.am || die 'sed on Makefile.am failed' + + eautoreconf +} + +src_configure() { + # bug #881325 + append-cflags -std=gnu89 + append-cppflags -D_DONT_USE_MKTEMP -DHAS_STREAMS_SUPPORT + + default +} -- cgit v1.2.3