Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wv for openSUSE:Factory checked in at 2026-09-29 17:54:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wv (Old) and /work/SRC/openSUSE:Factory/.wv.new.383539 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wv" Tue Sep 29 17:54:46 2026 rev:25 rq:1381484 version:1.2.9 Changes: -------- --- /work/SRC/openSUSE:Factory/wv/wv.changes 2024-11-15 15:42:44.561166984 +0100 +++ /work/SRC/openSUSE:Factory/.wv.new.383539/wv.changes 2026-09-29 17:56:18.432522725 +0200 @@ -1,0 +2,12 @@ +Tue Sep 29 10:53:27 UTC 2026 - Jan Engelhardt <[email protected]> + +- Restore wv-1.0.3-wvText.patch + +------------------------------------------------------------------- +Tue Sep 29 08:34:20 UTC 2026 - Tomáš Chvátal <[email protected]> + +- Drop obsolete -fstack-protector from CFLAGS (predates distro + -fstack-protector-strong in optflags; the trailing basic flag + silently downgraded strong to basic). + +------------------------------------------------------------------- New: ---- wv-1.0.3-wvText.patch ----------(New B)---------- New: - Restore wv-1.0.3-wvText.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wv.spec ++++++ --- /var/tmp/diff_new_pack.EE7cpa/_old 2026-09-29 17:56:19.377562136 +0200 +++ /var/tmp/diff_new_pack.EE7cpa/_new 2026-09-29 17:56:19.379562219 +0200 @@ -24,7 +24,8 @@ License: GPL-2.0-or-later Group: Productivity/Publishing/Word URL: http://wvware.sourceforge.net/ -Source0: https://www.abisource.com/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz +#servers_are_dead#Source0: https://www.abisource.com/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.gz Patch1: detect-imagick.patch Patch2: man-refs.patch Patch3: man-wvrtf-name.patch @@ -39,6 +40,7 @@ Patch12: man-remove-PU.patch Patch13: cross.patch Patch14: 0014-Add-missing-include.patch +Patch15: wv-1.0.3-wvText.patch BuildRequires: libexpat-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -80,7 +82,7 @@ perl -i -lpe 's{AM_INIT_AUTOMAKE.*}{AM_INIT_AUTOMAKE([foreign subdir-objects])}g' configure.ac autoreconf -f -i --verbose %define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat -Wformat-security -CFLAGS="%{optflags} %{warn_flags} -fno-strict-aliasing -fstack-protector" \ +CFLAGS="%{optflags} %{warn_flags} -fno-strict-aliasing" \ %configure \ --with-libwmf \ --with-expat \ ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.EE7cpa/_old 2026-09-29 17:56:19.431564388 +0200 +++ /var/tmp/diff_new_pack.EE7cpa/_new 2026-09-29 17:56:19.437564638 +0200 @@ -1,5 +1,5 @@ -mtime: 1731601261 -commit: 1462c0fe437ccccd5d1f8de4d3a471c40e4158d5751349072be61e275445db96 +mtime: 1790679244 +commit: 633c231f14b73ce092d2afd8d5e836e544423d2c18deef4986e0ef4de7c03a80 url: https://src.opensuse.org/clibs/wv revision: master ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-09-29 12:54:04.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ wv-1.0.3-wvText.patch ++++++ --- wvText.in | 56 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 19 deletions(-) Index: wv-1.2.9/wvText.in =================================================================== --- wv-1.2.9.orig/wvText.in +++ wv-1.2.9/wvText.in @@ -3,35 +3,49 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -tmpdir=${TMPDIR:-/tmp} # argument checking -if [ ${#} -ne "2" ]; then +if [ ${#} -eq "1" ]; then + o_file='-' +elif [ ${#} -ne "2" ]; then echo "Usage: ${0} <word document> <text output file>" exit 1 +else + o_file=${2} +fi + +if [ "x$o_file" = "x-" ]; then + o_file=/dev/stdout fi USE_DUMP=0 -which elinks >/dev/null 2>&1 +which w3m >/dev/null 2>&1 if [ ${?} -eq "0" ]; then - USE_DUMP=3 + USE_DUMP=4 else - which links >/dev/null 2>&1 + which elinks >/dev/null 2>&1 if [ ${?} -eq "0" ]; then - USE_DUMP=2 + USE_DUMP=3 else - which lynx >/dev/null 2>&1 + which links >/dev/null 2>&1 if [ ${?} -eq "0" ]; then - USE_DUMP=1 - fi - fi + USE_DUMP=2 + else + which lynx >/dev/null 2>&1 + if [ ${?} -eq "0" ]; then + USE_DUMP=1 + fi + fi + fi fi +tmpdir=$(mktemp -d ${TMPDIR:-/tmp}/wvText.XXXXXXXX) || { echo "$0: can not create temporary directory" >& 2; exit 1; } + if [ $USE_DUMP -eq "1" ]; then - echo "Could not find required program 'elinks' or 'links'" + echo "Could not find required program 'w3m', 'elinks' or 'links'" echo "Using lynx. Output will be pretty ugly." elif [ $USE_DUMP -eq "0" ]; then - echo "Could not find required program 'elinks', 'links', or even 'lynx'" + echo "Could not find required program 'w3m', 'elinks', 'links', or even 'lynx'" echo "Using wvWare -x wvText.xml. Output will be pretty bad." fi @@ -41,6 +55,7 @@ if [ $USE_DUMP -gt "0" ]; then which wvHtml >/dev/null 2>&1 if [ ${?} -ne "0" ]; then echo "Could not find required program 'wvHtml'" + rm -rf "${tmpdir}" exit 1 fi @@ -51,32 +66,35 @@ if [ $USE_DUMP -gt "0" ]; then wvHtml -1 "${1}" --targetdir="${tmpdir}" "${TMP_FILE}" >/dev/null 2>&1 if [ ${?} -ne "0" ]; then echo "Could not convert into HTML" + rm -rf "${tmpdir}" exit 1 fi - if [ $USE_DUMP -eq "3" ]; then + if [ $USE_DUMP -eq "4" ]; then + w3m -dump -T text/html "$tmpdir/$TMP_FILE" > "$o_file" + elif [ $USE_DUMP -eq "3" ]; then # elinks does the best - elinks -dump -force-html "${tmpdir}/${TMP_FILE}" > "${2}" + elinks -dump -force-html "${tmpdir}/${TMP_FILE}" > "$o_file" elif [ $USE_DUMP -eq "2" ]; then # links does a pretty good job - links -dump "${tmpdir}/${TMP_FILE}" > "${2}" + links -dump "${tmpdir}/${TMP_FILE}" > "$o_file" else # lynx sucks, but does better than wvText.xml - TERM=vt100 lynx -dump -force_html "${tmpdir}/${TMP_FILE}" > "${2}" + TERM=vt100 lynx -dump -force_html "${tmpdir}/${TMP_FILE}" > "$o_file" fi; if [ ${?} -ne "0" ]; then echo "Could not convert into Text" - rm -f "${tmpdir}/${TMP_FILE}" + rm -rf "${tmpdir}" exit 1 fi # clean up - rm -f "${tmpdir}/${TMP_FILE}" else # fall back onto our cruddy output # this is, admittedly, better than running # 'strings' on the word document though :) - wvWare -1 -x ${datadir}/wv/wvText.xml "${1}" > "${2}" + wvWare -1 -x ${datadir}/wv/wvText.xml "${1}" > "$o_file" fi +rm -rf "${tmpdir}"
