public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkzinc/, dev-tcltk/tkzinc/files/, profiles/
@ 2023-04-15  9:23 David Seifert
  0 siblings, 0 replies; only message in thread
From: David Seifert @ 2023-04-15  9:23 UTC (permalink / raw
  To: gentoo-commits

commit:     6f7de4e22e76a57de56210b7ec75f5ca660a8f09
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 09:23:00 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 09:23:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f7de4e2

dev-tcltk/tkzinc: treeclean

Closes: https://bugs.gentoo.org/895824
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-tcltk/tkzinc/Manifest                       |   1 -
 dev-tcltk/tkzinc/files/3.3.6-ldflags.patch      |  14 ---
 dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch |   9 --
 dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch |  29 -------
 dev-tcltk/tkzinc/files/tkzinc-3.3.6-gcc13.patch | 110 ------------------------
 dev-tcltk/tkzinc/metadata.xml                   |   8 --
 dev-tcltk/tkzinc/tkzinc-3.3.6-r2.ebuild         |  66 --------------
 profiles/package.mask                           |   5 --
 8 files changed, 242 deletions(-)

diff --git a/dev-tcltk/tkzinc/Manifest b/dev-tcltk/tkzinc/Manifest
deleted file mode 100644
index cabfe66233e8..000000000000
--- a/dev-tcltk/tkzinc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Tkzinc-3.3.6plus.tar.gz 1924729 BLAKE2B 9e02b113c37cfb870b2e238591e9b35cf5851c6534249312118c54d179d9ba7dbca17217cd924cfcfb1ef2444697840e3136d0fd1385b976a8a2bfda156c488d SHA512 ead998b69569ebec92e7f60415296262f60b91250b2fe15fdeb9fb71c38756006bedcd9ed2829d915cb6ce3a6461165a48c9037f8e397ba6049a76ae474f7838

diff --git a/dev-tcltk/tkzinc/files/3.3.6-ldflags.patch b/dev-tcltk/tkzinc/files/3.3.6-ldflags.patch
deleted file mode 100644
index 903ef9a2eaee..000000000000
--- a/dev-tcltk/tkzinc/files/3.3.6-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4
-index 0cbca13..c68af63 100644
---- a/tclconfig/tcl.m4
-+++ b/tclconfig/tcl.m4
-@@ -1447,7 +1447,8 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    # get rid of the warnings.
- 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
- 
--	    SHLIB_LD="${CC} -shared"
-+	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
-+	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT} ${LDFLAGS}'
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
- 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"

diff --git a/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch b/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
deleted file mode 100644
index f89ab9ac8e0e..000000000000
--- a/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/doc/refman.tex
-+++ b/doc/refman.tex
-@@ -1,4 +1,6 @@
-+\RequirePackage{ifpdf}
- \documentclass[11pt,twoside,a4paper]{book}
-+\usepackage [latin1]{inputenc}
- 
- %----------------------------------------------------------------------
- % $Revision: 1.94 $

diff --git a/dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch b/dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch
deleted file mode 100644
index e8bdb40b6083..000000000000
--- a/dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/generic/Window.c	2023-01-17 19:39:55.697886490 +0100
-+++ b/generic/Window.c	2023-01-17 19:41:15.619618094 +0100
-@@ -350,7 +350,7 @@
- #endif /* ifdef _WIN32 */
- 
-    /* Reset externalwindow */
--   wind->externalwindow = NULL;
-+   wind->externalwindow = 0;
- }
- 
- 
-@@ -384,7 +384,7 @@
-   wind->connection_anchor = TK_ANCHOR_SW;
-   wind->win = NULL;
-   wind->windowtitle = NULL;
--  wind->externalwindow = NULL;
-+  wind->externalwindow = 0;
-   
-   return TCL_OK;
- }
-@@ -407,7 +407,7 @@
-    */
-   wind->win = NULL;
-   wind->windowtitle = NULL;
--  wind->externalwindow = NULL;
-+  wind->externalwindow = 0;
- }
- 
- 

diff --git a/dev-tcltk/tkzinc/files/tkzinc-3.3.6-gcc13.patch b/dev-tcltk/tkzinc/files/tkzinc-3.3.6-gcc13.patch
deleted file mode 100644
index d4f0e311b03c..000000000000
--- a/dev-tcltk/tkzinc/files/tkzinc-3.3.6-gcc13.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/generic/Arc.c	2023-03-12 16:09:32.174198907 +0100
-+++ b/generic/Arc.c	2023-03-12 16:10:45.138024965 +0100
-@@ -350,7 +350,8 @@
- {
-   ZnPoint       *p_list, p, p2, o, o2;
-   ZnReal        width, height, d;
--  int           num_p, i, quality;
-+  unsigned int  num_p;
-+  int           i, quality;
-   ZnTransfo     *t = ((ZnItem) arc)->wi->current_transfo;
-   
-   if (!arc->render_shape) {
-@@ -1026,7 +1027,8 @@
- UpdateRenderShapeX(ArcItem      arc)
- {
-   ZnReal        ox, oy, width_2, height_2;
--  int           i, num_p;
-+  int           i;
-+  unsigned int  num_p;
-   ZnPoint       *p_list;
-   
-   if (!arc->render_shape) {
---- a/generic/Curve.c	2023-03-12 16:13:23.544477181 +0100
-+++ b/generic/Curve.c	2023-03-12 16:17:20.023675722 +0100
-@@ -1207,7 +1207,8 @@
-    * if last point join first point suppress markers at end points.
-    */
-   if (ISSET(cv->flags, MARKER_OK)) {
--    unsigned int h_width, h_height, width, height;
-+    unsigned int h_width, h_height;
-+    int          width, height;
-     int          tmp_x, tmp_y;
- 
-     ZnSizeOfImage(cv->marker, &width, &height);
---- a/generic/Item.c	2023-03-12 16:32:15.783502590 +0100
-+++ b/generic/Item.c	2023-03-12 16:37:06.944877639 +0100
-@@ -350,7 +350,8 @@
-       {
-         ZnList   new_grad_list = NULL;
-         ZnGradient       **grads;
--        unsigned int num_grads, j, k;
-+        int          num_grads;
-+        unsigned int j, k;
-         Tcl_Obj  **elems;
-             
-         if (Tcl_ListObjGetElements(wi->interp, args[i+1],
-@@ -467,7 +468,8 @@
-       {
-         ZnList   new_pat_list = NULL;
-         ZnImage  *pats;
--        unsigned int num_pats, j, k;
-+        int      num_pats;
-+        unsigned int j, k;
-         Tcl_Obj  **elems;
-         ZnBool   is_bmap = True;
-         
---- a/generic/Attrs.c	2023-03-12 16:52:59.616742607 +0100
-+++ b/generic/Attrs.c	2023-03-12 16:53:29.010275580 +0100
-@@ -170,7 +170,8 @@
-             Tcl_Obj     *name,
-             ZnBorder    *border)
- {
--  unsigned int j, len, largc;
-+  unsigned int j, len;
-+  int          largc;
-   Tcl_Obj      **largv;
-   char         *str;
- 
---- a/generic/PostScript.c	2023-03-12 17:11:26.721797681 +0100
-+++ b/generic/PostScript.c	2023-03-12 17:12:08.943156663 +0100
-@@ -1796,7 +1796,7 @@
-                   int               h)
- {
-   int              result;
--  XImage           *ximage;
-+  XImage           *ximage = NULL;
-   Tk_PhotoHandle   tkphoto;
-   
-   if (((TkPostscriptInfo *) ps_info)->prepass) {
---- a/generic/Draw.c	2023-03-12 17:14:07.814350198 +0100
-+++ b/generic/Draw.c	2023-03-12 17:15:16.429306397 +0100
-@@ -1271,7 +1271,7 @@
-       glEnd();
-     }
-     else {
--      int       num_cpoints;
-+      unsigned int num_cpoints;
-       ZnReal    lw_2 = line_width / 2.0;
-       ZnPoint   *cpoints = ZnGetCirclePoints(3, ZN_CIRCLE_COARSE,
-                                              0.0, 2*M_PI, &num_cpoints, NULL);
-@@ -2000,7 +2000,7 @@
-   Tcl_UniChar   c;
- 
-   while (len) {
--    clen = Tcl_UtfToUniChar(string, &c);
-+    clen = Tcl_UtfToUniChar((const char *)string, &c);
- 
-     ZnRenderGlyph(tfi, c);
- 
---- a/generic/Text.c	2023-03-12 17:16:54.897807077 +0100
-+++ b/generic/Text.c	2023-03-12 17:21:09.423924386 +0100
-@@ -1105,7 +1105,7 @@
-   int           font_height;  
-   int           underline_thickness, underline_pos=0, overstrike_pos=0;
-   int           sel_first_line=-1, sel_last_line=-1, cursor_line=-1;
--  int           sel_start_offset=0, sel_stop_offset=0, cursor_offset=0;
-+  unsigned int  sel_start_offset=0, sel_stop_offset=0, cursor_offset=0;
- 
-   if (!text->text_info) {
-     return;

diff --git a/dev-tcltk/tkzinc/metadata.xml b/dev-tcltk/tkzinc/metadata.xml
deleted file mode 100644
index 0eb27a71b580..000000000000
--- a/dev-tcltk/tkzinc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>tcltk@gentoo.org</email>
-    <name>TCL/TK project</name>
-  </maintainer>
-</pkgmetadata>

diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.6-r2.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.6-r2.ebuild
deleted file mode 100644
index c45317f8b64a..000000000000
--- a/dev-tcltk/tkzinc/tkzinc-3.3.6-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A Tk widget library"
-HOMEPAGE="http://www.tkzinc.org"
-SRC_URI="http://www.tkzinc.org/Packages/Tkzinc-${PV}plus.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc threads"
-
-DEPEND="
-	dev-lang/tk:=
-	media-libs/glew:=
-	virtual/opengl
-	doc? ( virtual/latex-base )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Tkzinc-${PV//.}+"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-ldflags.patch
-	"${FILESDIR}"/${PN}-3.3.4-latex.patch
-	"${FILESDIR}"/${P}-clang.patch
-	"${FILESDIR}"/${P}-gcc13.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	stat64 # used to test for Large File Support
-)
-
-HTML_DOCS='doc/*png doc/*html doc/*css'
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-gl=damage \
-		$(use_enable debug symbols) \
-		$(use_enable threads)
-}
-
-src_compile() {
-	default
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts emake pdf
-	fi
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/refman.pdf
-}
-
-src_test() {
-	emake test
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 850374fcb354..5ca556a67560 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -453,11 +453,6 @@ dev-ruby/six
 # Please upgrade to glib-2.76.0-r1.
 =dev-libs/glib-2.76.0
 
-# Alfredo Tupone <tupone@gentoo.org> (2023-03-14)
-# Masked for removal in 30 days.
-# Bug #895824, no rev dep
-dev-tcltk/tkzinc
-
 # Mike Pagano <mpagano@gentoo.org> (2023-03-10)
 # Mask =sys-kernel/gentoo-sources-5.15.99 since it does
 # not include 5.15.99 and is misleading


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2023-04-15  9:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-15  9:23 [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkzinc/, dev-tcltk/tkzinc/files/, profiles/ David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox