From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1640209-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D0B9015817D
for <garchives@archives.gentoo.org>; Sat, 8 Jun 2024 09:38:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E5336E29FF;
Sat, 8 Jun 2024 09:38:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AEA40E29FF
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Jun 2024 09:38:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id F0F23340C43
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Jun 2024 09:38:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CC361A32
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Jun 2024 09:38:13 +0000 (UTC)
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" <flow@gentoo.org>
Message-ID: <1717839476.6607bbc3810bc50e801efe8cf9d13cd33ec4916d.flow@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/wv/, app-text/wv/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-text/wv/files/wv-1.2.9-gcc14-build-fix.patch app-text/wv/wv-1.2.9-r4.ebuild
X-VCS-Directories: app-text/wv/files/ app-text/wv/
X-VCS-Committer: flow
X-VCS-Committer-Name: Florian Schmaus
X-VCS-Revision: 6607bbc3810bc50e801efe8cf9d13cd33ec4916d
X-VCS-Branch: master
Date: Sat, 8 Jun 2024 09:38:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b36ced75-ff36-424a-891f-e09f2d8b348f
X-Archives-Hash: 6ea78837b84fc6492cc655cfee733e1c
commit: 6607bbc3810bc50e801efe8cf9d13cd33ec4916d
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Feb 20 18:36:01 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 09:37:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6607bbc3
app-text/wv: Fix incompatible function pointer types assigning
Closes: https://bugs.gentoo.org/883207
Closes: https://bugs.gentoo.org/921570
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35446
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
app-text/wv/files/wv-1.2.9-gcc14-build-fix.patch | 22 ++++++++
app-text/wv/wv-1.2.9-r4.ebuild | 68 ++++++++++++++++++++++++
2 files changed, 90 insertions(+)
diff --git a/app-text/wv/files/wv-1.2.9-gcc14-build-fix.patch b/app-text/wv/files/wv-1.2.9-gcc14-build-fix.patch
new file mode 100644
index 000000000000..ea3a0649bc38
--- /dev/null
+++ b/app-text/wv/files/wv-1.2.9-gcc14-build-fix.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/921570
+Bug: https://bugs.gentoo.org/883207
+--- a/wvConfig.c
++++ b/wvConfig.c
+@@ -158,7 +158,7 @@ wvReleaseStateData (state_data * data)
+
+
+ static void
+-exstartElement (void *userData, const char *name, const char **atts)
++exstartElement (void *userData, const unsigned char *name, const unsigned char **atts)
+ {
+ unsigned int token_type;
+ expand_data *mydata = (expand_data *) userData;
+@@ -3371,7 +3371,7 @@ wvendElement (void *userData, const XML_Char *name)
+ }
+
+ static void
+-exendElement (void *userData, const char *name)
++exendElement (void *userData, const unsigned char *name)
+ {
+ /*
+ expand_data *mydata = (expand_data *)userData;
diff --git a/app-text/wv/wv-1.2.9-r4.ebuild b/app-text/wv/wv-1.2.9-r4.ebuild
new file mode 100644
index 000000000000..4f6cf22d4f1e
--- /dev/null
+++ b/app-text/wv/wv-1.2.9-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
+HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="tools wmf"
+
+RDEPEND="
+ >=dev-libs/glib-2:2
+ >=gnome-extra/libgsf-1.13:=
+ sys-libs/zlib
+ media-libs/libpng:0=
+ dev-libs/libxml2:2
+ tools? (
+ app-text/texlive-core
+ dev-texlive/texlive-latex
+ )
+ wmf? ( >=media-libs/libwmf-0.2.2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-C99-decls.patch
+ "${FILESDIR}"/${P}-gcc14-build-fix.patch
+)
+
+src_prepare() {
+ default
+
+ # remove -ansi flag, since it disables POSIX
+ # function declarations (bug #874396)
+ sed -i -e 's/-ansi//' configure || die
+
+ if ! use tools; then
+ sed -i -e '/bin_/d' GNUmakefile.am || die
+ sed -i -e '/SUBDIRS/d' GNUmakefile.am || die
+ sed -i -e '/\/GNUmakefile/d' configure.ac || die
+ sed -i -e '/wv[[:upper:]]/d' configure.ac || die
+ sed -i -e 's/-ansi//' configure.ac || die
+
+ # automake-1.13 fix, bug #467620
+ sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
+
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ econf $(use_with wmf libwmf)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ rm -f "${ED}"/usr/share/man/man1/wvConvert.1 || die
+ use tools && dosym wvWare.1 /usr/share/man/man1/wvConvert.1
+}