[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkzinc/files/, dev-tcltk/tkzinc/

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkzinc/files/, dev-tcltk/tkzinc/

[Alfredo Tupone]

commit:     b1c56b2b2e2c0551380e74411b27b88b91a38f3e
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 30 20:37:37 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Dec 30 20:37:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c56b2b

dev-tcltk/tkzinc: fix build of doc

Closes: https://bugs.gentoo.org/828121
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch                  | 9 +++------
 dev-tcltk/tkzinc/{tkzinc-3.3.6.ebuild => tkzinc-3.3.6-r1.ebuild} | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch b/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
index 6b697a7bfd78..f89ab9ac8e0e 100644
--- a/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
+++ b/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
@@ -1,12 +1,9 @@
- doc/refman.tex | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/doc/refman.tex b/doc/refman.tex
-index b384e97..be88fde 100644
 --- a/doc/refman.tex
 +++ b/doc/refman.tex
-@@ -1,3 +1,4 @@
+@@ -1,4 +1,6 @@
 +\RequirePackage{ifpdf}
  \documentclass[11pt,twoside,a4paper]{book}
++\usepackage [latin1]{inputenc}
  
  %----------------------------------------------------------------------
+ % $Revision: 1.94 $

diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild
similarity index 95%
rename from dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
rename to dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild
index 7f39c89740af..a94dde7d11fe 100644
--- a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkzinc/files/, dev-tcltk/tkzinc/

[Alfredo Tupone]

commit:     3def5aac5dced458b28b32b54dd4391917e8da34
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 18:44:22 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 18:44:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3def5aac

dev-tcltk/tkzinc: fix incomp pointer conversion

Closes: https://bugs.gentoo.org/871120
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch | 29 +++++++++++++++++++++++++
 dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild         |  5 +++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch b/dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch
new file mode 100644
index 000000000000..e8bdb40b6083
--- /dev/null
+++ b/dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch
@@ -0,0 +1,29 @@
+--- 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/tkzinc-3.3.6-r1.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild
index a94dde7d11fe..c7fa5fd154eb 100644
--- a/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,8 @@ S="${WORKDIR}/Tkzinc-${PV//.}+"
 PATCHES=(
 	"${FILESDIR}"/${PV}-ldflags.patch
 	"${FILESDIR}"/${PN}-3.3.4-latex.patch
-	)
+	"${FILESDIR}"/${P}-clang.patch
+)
 
 HTML_DOCS='doc/*png doc/*html doc/*css'