Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xv for openSUSE:Factory:NonFree checked in at 2023-06-14 16:27:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/xv (Old) and /work/SRC/openSUSE:Factory:NonFree/.xv.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xv" Wed Jun 14 16:27:52 2023 rev:22 rq:1092794 version:4.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/xv/xv.changes 2017-06-20 09:41:26.539211206 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.xv.new.15902/xv.changes 2023-06-14 16:27:53.769935949 +0200 @@ -1,0 +2,51 @@ +Tue Jun 13 08:36:41 UTC 2023 - Dr. Werner Fink <[email protected]> + +- Add a pre_checkin.sh script to remove epsf.ps of Adobe Systems Inc. + from tar ball due to trademark and copyright problems +- Extend patch xv-3.10a.dif to remove epsf.ps from cmake INSTALL + +------------------------------------------------------------------- +Tue May 30 13:56:32 UTC 2023 - Dr. Werner Fink <[email protected]> + +- Extend patch xv-3.10a-overflow.dif to catch integer overflow + for 24bit pcx pictures + +------------------------------------------------------------------- +Tue May 30 12:08:35 UTC 2023 - Dr. Werner Fink <[email protected]> + +- Switch to https://github.com/jasper-software/xv with its + Version 4.1.1 based on xv-3.10a and the jumbo patches + and fixes as well as the enhancements. + * Fixed a build problem on MacOS. + * Added support for webp format. + * Applied jumbo patch set and numerous other patches including those from the + Fedora Linux RPM for the XV software. + * Applied several patches for the XV software from OpenBSD. + * Applied several patches for the XV software from OpenSUSE. + * Added support for CMake-based builds. + * Added a GitHub Actions CI framework for performing test builds on each + repository push. + * Added a GitHub Actions workflow for generating release tarballs on each + repository tag corresponding to a release. + * Added support for JasPer 3.0.0. +- Remove upstream patches + * xv-3.10a-dirw.dif + * xv-3.10a-enhancements.20070520-20081216.diff + * xv-3.10a-jpeg8.dif + * xv-3.10a-jumbo-fix-enh-patch-20070520.txt + * xv-3.10a-jumbo-patches-20070520.tar.bz2 + * xv-3.10a-libpng15.patch + * xv-3.10a-png-gimp.patch + * xv-3.10a-png.dif + * xv-3.10a-signal.dif + * xv-3.10a-ticks.dif + * xv-3.10a-xwd.dif +- Switch to cmake build +- Package split for the huge documentations + +------------------------------------------------------------------- +Mon Feb 21 14:21:59 UTC 2022 - Dr. Werner Fink <[email protected]> + +- Change URL to latest active development project + +------------------------------------------------------------------- Old: ---- xv-3.10a-dirw.dif xv-3.10a-enhancements.20070520-20081216.diff xv-3.10a-jpeg8.dif xv-3.10a-jumbo-patches-20070520.tar.bz2 xv-3.10a-libpng15.patch xv-3.10a-png-gimp.patch xv-3.10a-png.dif xv-3.10a-signal.dif xv-3.10a-ticks.dif xv-3.10a-xwd.dif xv-3.10a.tar.bz2 New: ---- pre_checkin.sh xv-3.10a-js-4.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xv.spec ++++++ --- /var/tmp/diff_new_pack.RUvdyq/_old 2023-06-14 16:27:54.965943301 +0200 +++ /var/tmp/diff_new_pack.RUvdyq/_new 2023-06-14 16:27:54.973943350 +0200 @@ -15,48 +15,43 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%if "%{_exec_prefix}" == "%{_prefix}/X11R6" -%global _mandir %{_prefix}/man -%define _x11data %{_prefix}/lib/X11 -%define _libx11 %{_x11data} -%else -%define _x11data %{_datadir}/X11 -%define _libx11 %{_prefix}/lib/X11 +%if ! %{defined _distconfdir} +%define _distconfdir %{_prefix}%{_sysconfdir} +%define dousretc 1 %endif + Name: xv -Version: 3.10a +Version: 4.1.1 Release: 0 Summary: GIF/TIFF/JPEG/PostScript Image Viewer License: SUSE-NonFree Group: Productivity/Graphics/Viewers -Url: http://www.trilon.com/xv/ -Source: xv-3.10a.tar.bz2 -#Url http://www.gregroelofs.com/greg_xv.html -Source1: xv-3.10a-jumbo-patches-20070520.tar.bz2 +Url: https://github.com/jasper-software/xv +#Url: https://www.trilon.com/xv/ +#Url: https://www.gregroelofs.com/greg_xv.html +Source: xv-3.10a-js-%{version}.tar.gz Source2: xsetbgimg Source3: xv.desktop Source4: xv.png Source5: xv-tests.tar.bz2 Patch0: xv-3.10a.dif -Patch1: xv-3.10a-ticks.dif -Patch2: xv-3.10a-signal.dif Patch3: xv-3.10a-overflow.dif -Patch4: xv-3.10a-jpeg8.dif -Patch5: xv-3.10a-png.dif -Patch6: xv-3.10a-xwd.dif -Patch7: xv-3.10a-dirw.dif -Patch8: xv-3.10a-enhancements.20070520-20081216.diff -Patch9: xv-3.10a-libpng15.patch -Patch10: xv-3.10a-png-gimp.patch +BuildRequires: cmake BuildRequires: dos2unix BuildRequires: groff -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libtiff-devel +BuildRequires: imake +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(jasper) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(zlib) BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel -BuildRequires: zlib-devel Provides: xv300 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo %{_prefix}/X11R6)} @@ -78,55 +73,58 @@ Please remember that this program has shareware status for commercial use. +%package doc +Summary: Documentation about XV +Group: Documentation/Other +Requires: %{name} = %{version} +Provides: %{name}:%{_docdir}/%{name}/README +BuildArch: noarch + +%description doc +The documentation about XV. + %prep -%setup -q -b1 - patch -p1 -s --suffix=.jumbo-20070520 < ../xv-3.10a-jumbo-fix-enh-patch-20070520.txt -%patch8 -b .jumbo-20081216 -%patch1 -b .ticks -%patch2 -b .sig +%setup -q -n xv-3.10a-js-%{version} %patch3 -b .ovf -%patch4 -b .jpg8 -%patch5 -b .png -%patch6 -b .xwd -%patch7 -b .dirw -%patch9 -b .libpng5 -%patch0 -%patch10 -p1 -b .png-gimp +%patch0 -b .p0 %build -# Do not overwrite CFLAGS here -RPM_OPT_FLAGS="%{optflags} -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector" -xmkmf -a -make %{?_smp_mflags} +CFLAGS="%{optflags} -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -DDOCDIR=\\\"%{_docdir}/%{name}\\\"" +export CFLAGS +%cmake -DCMAKE_C_COMPILER=gcc \ + -DBUILD_STATIC_LIBS=OFF \ + -DCMAKE_INSTALL_DO_STRIP=OFF \ + -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} +%make_build -O %{?_smp_mflags} V=1 CC=gcc %install -mv docs/README docs/README.docs -%make_install -make install.man DESTDIR=%{buildroot} -rm docs/*._man -mkdir man -for m in docs/*.man; do - test -e $m || continue - troff -Tlatin1 -t -mandoc < $m | grotty -bou > ${m%.*}.txt - mv $m man/ -done -ln -sf README COPYRIGHT -if test -e docs/xvdocs.pdf ; then - rm -vf docs/xvdocs.ps +%make_install -C build V=1 CC=gcc MANSUF=1x +install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/xsetbgimg +ln -sf README src/COPYRIGHT +if test -e src/docs/manuals/xvdocs.pdf ; then + rm -vf src/docs/manuals/xvdocs.ps fi -if test -e docs/xvtitle.ps ; then - cp -p docs/xvtitle.ps tmp.ps - dos2unix docs/xvtitle.ps - touch -r tmp.ps docs/xvtitle.ps +if test -e src/docs/manuals/xvtitle.ps ; then + cp -p src/docs/manuals/xvtitle.ps tmp.ps + dos2unix src/docs/manuals/xvtitle.ps + touch -r tmp.ps src/docs/manuals/xvtitle.ps fi -install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/xsetbgimg -rm -f %{buildroot}%{_libx11}/xv_mgcsfx.sample %suse_update_desktop_file -i xv Graphics Viewer %files %defattr(-,root,root) -%doc README.jumbo README.pcd README -%doc COPYRIGHT docs/* +%license src/COPYRIGHT +%exclude %doc %{_docdir}/%{name}/BUGS +%exclude %doc %{_docdir}/%{name}/CHANGELOG +%exclude %doc %{_docdir}/%{name}/CPMASK +%exclude %doc %{_docdir}/%{name}/IDEAS +%exclude %doc %{_docdir}/%{name}/README.FLmask +%exclude %doc %{_docdir}/%{name}/copyright.h +%doc src/docs/help +%if %{defined dousretc} +%dir %{_distconfdir}/ +%endif +%{_distconfdir}/xv_mgcsfx %{_datadir}/applications/xv.desktop %{_datadir}/pixmaps/xv.png %{_bindir}/bggen @@ -135,10 +133,16 @@ %{_bindir}/xsetbgimg %{_bindir}/xv %{_bindir}/xvpictoppm -%{_mandir}/man1/bggen.1x%{ext_man} -%{_mandir}/man1/vdcomp.1x%{ext_man} -%{_mandir}/man1/xcmap.1x%{ext_man} -%{_mandir}/man1/xv.1x%{ext_man} -%{_mandir}/man1/xvpictoppm.1x%{ext_man} +%{_mandir}/man1/*.1x%{ext_man} +%dir %{_mandir}/fi/ +%dir %{_mandir}/fi/man1/ +%{_mandir}/fi/man1/*.1x%{ext_man} +%{_mandir}/pl/man1/*.1x%{ext_man} + +%files doc +%defattr(-,root,root) +%dir %doc %{_docdir}/%{name}/ +%exclude %{_docdir}/%{name}/help +%doc %{_docdir}/%{name}/* %changelog ++++++ pre_checkin.sh ++++++ #!/bin/bash # This script is called automatically during autobuild checkin. version="$(sed -rn '/^Version:/{ s/^Version:[[:space:]]+//p }' xv.spec)" tarball="$(sed -rn "/^Source[[:digit:]]*:[[:space:]]+xv.*\.tar\.gz/ {s/^Source[[:digit:]]*:[[:space:]]+//;s/%\{version\}/${version}/p }" xv.spec)" test -e "${tarball}" || { echo "No such file: ${tarball}" 1>&2; exit 1; } found=$(tar --wildcards --list --file "${tarball}" '*/epsf.ps' 2>/dev/null) || exit 0 trap 'rm -vf $tmp' EXIT HUP TERM tmp=$(mktemp XXXXXXXX.tar.gz) || exit 1 gzip -d < "${tarball}" | tar --wildcards --delete '*/epsf.ps' | gzip > $tmp chmod 644 $tmp mv $tmp $tarball ++++++ xv-3.10a-overflow.dif ++++++ --- /var/tmp/diff_new_pack.RUvdyq/_old 2023-06-14 16:27:55.033943719 +0200 +++ /var/tmp/diff_new_pack.RUvdyq/_new 2023-06-14 16:27:55.037943744 +0200 @@ -9,18 +9,27 @@ ! picture dimensions otherwise the new gcc will fool us ! with a false negative check. ! ---- xv.c -+++ xv.c 2011-07-07 08:58:48.831925986 +0000 +--- + src/xv.c | 33 ++++++++++++++++----------------- + src/xv.h | 16 +++++++++++++++- + src/xvbmp.c | 9 ++++++--- + src/xvpbm.c | 38 ++++++++++++++++++++++++++++++++------ + src/xvpcx.c | 3 ++- + src/xvtext.c | 4 ++-- + 6 files changed, 73 insertions(+), 30 deletions(-) + +--- src/xv.c ++++ src/xv.c 2023-05-30 09:09:45.343497970 +0000 @@ -64,7 +64,7 @@ static const char *maingeom = NULL; static const char *icongeom = NULL; static Atom __SWM_VROOT = None; --static char basefname[128]; /* just the current fname, no path */ +-static char basefname[NAME_MAX+1]; /* just the current fname, no path */ +static char basefname[MAXNAMELEN+1]; /* just the current fname, no path */ #ifdef TV_L10N # ifndef TV_FONTSET -@@ -2094,7 +2094,7 @@ static int openPic(filenum) +@@ -2104,7 +2104,7 @@ static int openPic(filenum) int oldCXOFF, oldCYOFF, oldCWIDE, oldCHIGH, wascropped; char *tmp; char *fullname, /* full name of the original file */ @@ -29,7 +38,7 @@ #ifdef MACBINARY char origname[512]; /* file name of original file (NO processing) */ origname[0] = '\0'; -@@ -2137,7 +2137,7 @@ static int openPic(filenum) +@@ -2147,7 +2147,7 @@ static int openPic(filenum) return 0; } @@ -38,18 +47,20 @@ fullname = filename; goto HAVE_FILENAME; } -@@ -2180,8 +2180,8 @@ static int openPic(filenum) +@@ -2192,9 +2192,9 @@ static int openPic(filenum) + if (!i) goto FAILED; /* shouldn't happen */ - i = LoadPad(&pinfo, fullfname); fullname = fullfname; - strcpy(filename, fullfname); +- if (strlen(BaseName(fullfname)) > NAME_MAX) goto FAILED; - strcpy(basefname, BaseName(fullfname)); + strncpy(filename, fullfname, sizeof(filename)-1); ++ if (strlen(BaseName(fullfname)) > MAXNAMELEN) goto FAILED; + strncpy(basefname, BaseName(fullfname), sizeof(basefname)-1); - if (!i) goto FAILED; /* shouldn't happen */ -@@ -2225,7 +2225,7 @@ static int openPic(filenum) + if (killpage) { /* kill old page files, if any */ +@@ -2237,7 +2237,7 @@ static int openPic(filenum) fullname = GetDirFullName(); if (ISPIPE(fullname[0])) { /* read from a pipe. */ @@ -58,19 +69,21 @@ if (readpipe(fullname, filename)) goto FAILED; frompipe = 1; } -@@ -2247,9 +2247,8 @@ static int openPic(filenum) +@@ -2259,10 +2259,9 @@ static int openPic(filenum) else fullname = namelist[filenum]; #endif - strcpy(fullfname, fullname); +- if (strlen(BaseName(fullfname)) > NAME_MAX) goto FAILED; - strcpy(basefname, BaseName(fullname)); - + strncpy(fullfname, fullname, sizeof(fullfname)-1); ++ if (strlen(BaseName(fullfname)) > MAXNAMELEN) goto FAILED; + strncpy(basefname, BaseName(fullname), sizeof(basefname)-1); /* chop off trailing ".Z", ".z", or ".gz" from displayed basefname, if any */ if (strlen(basefname)>2 && strcmp(basefname+strlen(basefname)-2,".Z")==0) -@@ -2345,7 +2344,7 @@ static int openPic(filenum) +@@ -2358,7 +2357,7 @@ static int openPic(filenum) } } @@ -79,7 +92,7 @@ /* if the file is STDIN, write it out to a temp file */ -@@ -2357,7 +2356,7 @@ static int openPic(filenum) +@@ -2370,7 +2369,7 @@ static int openPic(filenum) #endif #ifndef VMS @@ -88,7 +101,7 @@ #else /* it is VMS */ sprintf(filename, "[]xvXXXXXX"); #endif -@@ -2415,7 +2414,7 @@ static int openPic(filenum) +@@ -2428,7 +2427,7 @@ static int openPic(filenum) /* if we made a /tmp file (from stdin, etc.) won't need it any more */ if (strcmp(fullname,filename)!=0) unlink(filename); @@ -97,7 +110,7 @@ } else filetype = RFT_ERROR; -@@ -2469,14 +2468,14 @@ static int openPic(filenum) +@@ -2482,14 +2481,14 @@ static int openPic(filenum) filetype = ReadFileType(tmpname); if (strcmp(fullname,filename)!=0) unlink(filename); @@ -115,9 +128,9 @@ if (!polling) ErrPopUp(foostr, "\nBummer!"); ---- xv.h -+++ xv.h 2011-07-07 09:00:42.988883250 +0000 -@@ -87,6 +87,9 @@ +--- src/xv.h ++++ src/xv.h 2023-05-30 08:48:51.110190986 +0000 +@@ -117,6 +117,9 @@ # ifndef _LINUX_LIMITS_H # include <linux/limits.h> # endif @@ -127,7 +140,7 @@ # ifndef USLEEP # define USLEEP # endif -@@ -327,9 +330,20 @@ +@@ -370,9 +373,20 @@ #endif #ifndef MAXPATHLEN @@ -149,8 +162,8 @@ #ifdef SVR4 # define random lrand48 ---- xvbmp.c -+++ xvbmp.c 2008-05-27 12:37:34.384175224 +0200 +--- src/xvbmp.c ++++ src/xvbmp.c 2023-05-30 09:09:45.347497898 +0000 @@ -191,6 +191,9 @@ int LoadBMP(fname, pinfo) bPad -= 12; } @@ -188,8 +201,8 @@ if (comp == BI_RGB) { /* read uncompressed data */ padw = ((w + 3)/4) * 4; /* 'w' padded to a multiple of 4pix (32 bits) */ ---- xvpbm.c -+++ xvpbm.c 2008-05-26 17:47:31.890952085 +0200 +--- src/xvpbm.c ++++ src/xvpbm.c 2023-05-30 09:09:45.347497898 +0000 @@ -5,6 +5,7 @@ * WritePBM(fp,pic,ptype,w,h,r,g,b,numcols,style,raw,cmt,comment) */ @@ -286,8 +299,20 @@ return pbmError(bname, "image dimensions too large"); /* allocate 24-bit image */ ---- xvtext.c -+++ xvtext.c 2011-11-02 12:38:01.383646158 +0000 +--- src/xvpcx.c ++++ src/xvpcx.c 2023-05-30 13:31:20.392741202 +0000 +@@ -255,7 +255,8 @@ static int pcxLoadImage24(fname, fp, pin + byte *hdr; + { + byte *pix, *pic24, scale[256]; +- int c, i, j, w, h, maxv, cnt, planes, bperlin, nbytes, count; ++ int c, i, j, w, h, maxv, cnt, planes, bperlin; ++ long nbytes, count; + + w = pinfo->w; h = pinfo->h; + +--- src/xvtext.c ++++ src/xvtext.c 2023-05-30 09:09:45.347497898 +0000 @@ -545,9 +545,9 @@ void ChangeCommentText() tv->freeonclose = 0; ++++++ xv-3.10a.dif ++++++ --- /var/tmp/diff_new_pack.RUvdyq/_old 2023-06-14 16:27:55.049943818 +0200 +++ /var/tmp/diff_new_pack.RUvdyq/_new 2023-06-14 16:27:55.053943842 +0200 @@ -1,5 +1,48 @@ ---- Imakefile -+++ Imakefile 2008-05-23 13:24:33.000000000 +0200 +--- + src/CMakeLists.txt | 7 ++---- + src/Imakefile | 58 +++++++++++++++++++++++++++++++++++++++-------------- + src/Makefile | 2 - + src/Makefile.std | 12 ---------- + src/bggen.c | 2 - + src/config.h | 16 +++++++------- + src/xv.h | 26 ++++++++--------------- + src/xvevent.c | 4 ++- + src/xvgrab.c | 27 ++++++++++++++---------- + 9 files changed, 85 insertions(+), 69 deletions(-) + +--- src/CMakeLists.txt ++++ src/CMakeLists.txt 2023-06-13 08:47:26.877090379 +0000 +@@ -146,17 +146,17 @@ set(man_pages + foreach(file ${man_pages}) + string(REGEX REPLACE "\\.[^.]*$" "" base ${file}) + install( +- FILES docs/${file} RENAME ${base}.1 ++ FILES docs/${file} RENAME ${base}.1x + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + ) + endforeach() + + install(FILES +- pl/man1/xvpictoppm.1 ++ pl/man1/xvpictoppm.1 RENAME xvpictoppm.1x + DESTINATION "${CMAKE_INSTALL_MANDIR}/pl/man1") + + install(FILES +- fi/man1/xv.1 ++ fi/man1/xv.1 RENAME xv.1x + DESTINATION "${CMAKE_INSTALL_MANDIR}/fi/man1") + + # Install files into SYSCONFDIR. +@@ -184,7 +184,6 @@ install(FILES + # Install files into DOCDIR/formats. + install(FILES + docs/formats/bmp.doc +- docs/formats/epsf.ps + docs/formats/gif87.doc + docs/formats/gif89.doc + docs/formats/gif.ack +--- src/Imakefile ++++ src/Imakefile 2023-05-30 09:09:45.347497898 +0000 @@ -6,13 +6,31 @@ /* if, for whatever reason, you're unable to get the JPEG library to compile * on your machine, *COMMENT OUT* the following line @@ -94,7 +137,7 @@ INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE) -@@ -253,6 +271,16 @@ DependTarget() +@@ -255,6 +273,16 @@ DependTarget() DependSubdirs($(SUBDIRS)) #endif @@ -111,8 +154,19 @@ NormalProgramTarget(xv,$(OBJS1),$(DEPLIBS),$(LOCAL_LIBRARIES),) NormalProgramTarget(bggen,$(OBJS2),$(DEPLIBS),$(LOCAL_LIBRARIES),) ---- Makefile.std -+++ Makefile.std 2008-05-26 14:15:01.772974103 +0200 +--- src/Makefile ++++ src/Makefile 2023-05-30 11:18:17.016623745 +0000 +@@ -59,7 +59,7 @@ CLEANDIR = cleandir + PREFIX = /usr/local + BINDIR = $(PREFIX)/bin + MANDIR = $(PREFIX)/share/man/man1 +-MANSUF = 1 ++MANSUF = 1x + DOCDIR = $(PREFIX)/share/doc/xv + LIBDIR = $(PREFIX)/lib/xv + SYSCONFDIR = /etc +--- src/Makefile.std ++++ src/Makefile.std 2023-05-30 09:09:45.347497898 +0000 @@ -230,9 +230,6 @@ PDS = -DDOPDS # Note: You may need to add '-I/usr/include/X11R5' (or R6, or whatever) # to whichever of those lines you used, as HP tends to store their X11 @@ -123,30 +177,32 @@ ### for Linux, uncomment one of the following lines: -@@ -318,10 +315,6 @@ PDS = -DDOPDS +@@ -317,11 +314,6 @@ PDS = -DDOPDS + # #MALLOC = -DNEED_MALLOC_H - +- -# if your X Window System compiled with -DX_LOCALE, -# uncomment the following line: -# TVL10N = -DX_LOCALE - # Install directory of xv_mgcsfx.sample. - MGCSFXDIR = $(LIBDIR) + MGCSFXDIR = $(SYSCONFDIR) # Directory of default configuration file. -@@ -341,9 +334,7 @@ CFLAGS = $(CCOPTS) $(PNG) $(PNGINC) $(ZL +@@ -341,9 +333,7 @@ CFLAGS = $(CCOPTS) $(PNG) $(PNGINC) $(ZL $(VPRINTF) $(TIMERS) -DDOCDIR=\"$(DOCDIR)\" \ -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DXVEXECPATH=\"$(LIBDIR)\" -### remove -lm for BeOS: - LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -L/usr/X11R6/lib -lX11 -lm --#LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -lX11 +-LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -L/usr/X11R6/lib -lXt -lX11 -lm +-#LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -lXt -lX11 ++LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -lXt -lX11 -lm OBJS = xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \ xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \ ---- bggen.c -+++ bggen.c 2005-11-29 19:02:05.000000000 +0100 -@@ -34,7 +34,7 @@ +--- src/bggen.c ++++ src/bggen.c 2023-05-30 09:09:45.347497898 +0000 +@@ -36,7 +36,7 @@ #define MAXCOLS 128 /* some VMS thing... */ @@ -155,8 +211,8 @@ #include <ctype.h> #endif ---- config.h -+++ config.h 2008-05-26 14:19:11.074249420 +0200 +--- src/config.h ++++ src/config.h 2023-05-30 09:09:45.347497898 +0000 @@ -14,13 +14,13 @@ * 'which gunzip' to find if you have gunzip, and where it lives; ditto for * gzip) @@ -227,9 +283,9 @@ #undef VIRTUAL_TD #if defined(VIRTUAL_TD) && !defined(AUTO_EXPAND) ---- xv.h -+++ xv.h 2008-05-26 14:30:02.712261023 +0200 -@@ -73,12 +73,6 @@ +--- src/xv.h ++++ src/xv.h 2023-05-30 09:09:45.351497825 +0000 +@@ -98,12 +98,6 @@ # define SVR4 #endif @@ -242,7 +298,7 @@ #include <signal.h> /* for interrupt handling */ -@@ -133,16 +127,6 @@ +@@ -161,16 +155,6 @@ #endif @@ -259,7 +315,7 @@ /* include files */ #include <stdio.h> #include <math.h> -@@ -300,7 +284,9 @@ +@@ -333,7 +317,9 @@ # endif #endif @@ -270,7 +326,7 @@ /* Use S_ISxxx macros in stat-related stuff * make them if missing, along with a few fictitious ones -@@ -401,6 +387,12 @@ +@@ -445,6 +431,12 @@ # define SEEK_END 2 #endif @@ -283,9 +339,9 @@ #if defined(__mips) && defined(__SYSTYPE_BSD43) # define strstr(A,B) pds_strstr((A),(B)) # undef S_IFIFO ---- xvevent.c -+++ xvevent.c 2005-11-30 13:50:25.000000000 +0100 -@@ -2653,7 +2689,7 @@ int xvErrorHandler(disp, err) +--- src/xvevent.c ++++ src/xvevent.c 2023-05-30 09:09:45.351497825 +0000 +@@ -2671,7 +2671,7 @@ int xvErrorHandler(disp, err) /* in case the error occurred during the Grab command... */ XUngrabServer(theDisp); @@ -294,7 +350,7 @@ xerrcode = err->error_code; -@@ -2671,6 +2707,8 @@ int xvErrorHandler(disp, err) +@@ -2689,6 +2689,8 @@ int xvErrorHandler(disp, err) (err->request_code == 113 /* X_KillClient */ ) || (xerrcode == BadLength && err->request_code==18 /* X_ChangeProp */ ) || (xerrcode == BadMatch && err->request_code==73 /* X_GetImage */ ) || @@ -303,8 +359,8 @@ (xerrcode == BadWindow && err->request_code==20 /* X_GetProperty*/)) return 0; ---- xvgrab.c -+++ xvgrab.c 2008-05-26 14:40:26.275437700 +0200 +--- src/xvgrab.c ++++ src/xvgrab.c 2023-05-30 09:09:45.351497825 +0000 @@ -12,6 +12,7 @@ #include "copyright.h" @@ -401,29 +457,4 @@ } ---- xvtext.c -+++ xvtext.c 2008-05-26 15:24:13.309856562 +0200 -@@ -1827,7 +1827,7 @@ void ShowLicense() - LC(""); - LC("Note: The documentation (README.jumbo, xvdocs.ps, and/or xvdocs.pdf)"); - #ifdef __STDC__ -- LC("may be installed in '" DOCDIR "'."); -+ LC("may be installed in '/usr/share/doc/packages/xv'."); - #else - LC("may be installed in '/usr/local/share/doc/xv'."); - #endif ---- xvvd.c -+++ xvvd.c 2008-05-26 16:38:24.697750266 +0200 -@@ -83,11 +83,7 @@ void Vdinit() - #else - sprintf(vdroot, "Sys$Scratch:xvvdXXXXXX"); - #endif /* VMS */ --#ifdef USE_MKSTEMP -- close(mkstemp(vdroot)); --#else - mktemp(vdroot); --#endif - - if (!vd_recursive_mkdir(vdroot)) - tmpdir = vdroot;
