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 2024-08-14 14:13:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/xv (Old) and /work/SRC/openSUSE:Factory:NonFree/.xv.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xv" Wed Aug 14 14:13:16 2024 rev:25 rq:1193721 version:6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/xv/xv.changes 2024-07-01 11:18:00.261888959 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.xv.new.7232/xv.changes 2024-08-14 14:13:17.400627047 +0200 @@ -1,0 +2,14 @@ +Tue Aug 13 13:59:43 UTC 2024 - Dr. Werner Fink <[email protected]> + +- Update to 6.0.0 (2024-08-12) based on xv-3.10a + * Add basic HiDPI support. + * Improve the compatibility of the source code with more modern C standards + (e.g., C23). + * Fix the build with link-time optimization (#25). + * Fix many other bugs. +- Port patches + * xv-3.10a-overflow.dif + * xv-3.10a.dif +- Drop patch xv-more-bmp-formats.patch as now upstream + +------------------------------------------------------------------- Old: ---- xv-3.10a-js-5.2.0.tar.gz xv-more-bmp-formats.patch New: ---- xv-3.10a-js-6.0.0.tar.gz BETA DEBUG BEGIN: Old: * xv-3.10a.dif - Drop patch xv-more-bmp-formats.patch as now upstream BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xv.spec ++++++ --- /var/tmp/diff_new_pack.mK9YaY/_old 2024-08-14 14:13:18.496672770 +0200 +++ /var/tmp/diff_new_pack.mK9YaY/_new 2024-08-14 14:13:18.496672770 +0200 @@ -21,7 +21,7 @@ %endif Name: xv -Version: 5.2.0 +Version: 6.0.0 Release: 0 Summary: GIF/TIFF/JPEG/PostScript Image Viewer License: SUSE-NonFree @@ -35,7 +35,6 @@ Source4: xv.png Source5: xv-tests.tar.bz2 Patch0: xv-3.10a.dif -Patch2: xv-more-bmp-formats.patch Patch3: xv-3.10a-overflow.dif BuildRequires: cmake BuildRequires: dos2unix @@ -86,7 +85,6 @@ %prep %setup -n xv-3.10a-js-%{version} -%patch -P2 -b .mbmp %patch -P3 -b .ovf %patch -P0 -b .p0 @@ -129,6 +127,7 @@ %{_distconfdir}/xv_mgcsfx %{_datadir}/applications/xv.desktop %{_datadir}/pixmaps/xv.png +%{_datadir}/pixmaps/xv.xpm %{_bindir}/bggen %{_bindir}/vdcomp %{_bindir}/xcmap ++++++ xv-3.10a-js-5.2.0.tar.gz -> xv-3.10a-js-6.0.0.tar.gz ++++++ ++++ 25723 lines of diff (skipped) ++++++ xv-3.10a-overflow.dif ++++++ --- /var/tmp/diff_new_pack.mK9YaY/_old 2024-08-14 14:13:18.920690459 +0200 +++ /var/tmp/diff_new_pack.mK9YaY/_new 2024-08-14 14:13:18.924690626 +0200 @@ -10,35 +10,24 @@ ! with a false negative check. ! --- - 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 | 25 ++++++++++++------------- + src/xv.h | 17 ++++++++++++++++- + src/xvpbm.c | 38 ++++++++++++++++++++++++++++++++------ + src/xvpcx.c | 3 ++- + 4 files changed, 62 insertions(+), 21 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; ++++ src/xv.c 2024-08-13 13:24:01.832191677 +0000 +@@ -51,7 +51,7 @@ static const char *icongeom = NULL; static Atom __SWM_VROOT = None; + static int dpiMultSet = 0; -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 -@@ -2104,7 +2104,7 @@ static int openPic(filenum) - int oldCXOFF, oldCYOFF, oldCWIDE, oldCHIGH, wascropped; - char *tmp; - char *fullname, /* full name of the original file */ -- filename[512]; /* full name of file to load (could be /tmp/xxx)*/ -+ filename[MAXPATHLEN+1]; /* full name of file to load (could be /tmp/xxx)*/ - #ifdef MACBINARY - char origname[512]; /* file name of original file (NO processing) */ - origname[0] = '\0'; -@@ -2147,7 +2147,7 @@ static int openPic(filenum) +@@ -2233,7 +2233,7 @@ static int openPic(int filenum) return 0; } @@ -47,7 +36,7 @@ fullname = filename; goto HAVE_FILENAME; } -@@ -2192,9 +2192,9 @@ static int openPic(filenum) +@@ -2278,9 +2278,9 @@ static int openPic(int filenum) if (!i) goto FAILED; /* shouldn't happen */ fullname = fullfname; @@ -60,7 +49,7 @@ if (killpage) { /* kill old page files, if any */ -@@ -2237,7 +2237,7 @@ static int openPic(filenum) +@@ -2323,7 +2323,7 @@ static int openPic(int filenum) fullname = GetDirFullName(); if (ISPIPE(fullname[0])) { /* read from a pipe. */ @@ -69,7 +58,7 @@ if (readpipe(fullname, filename)) goto FAILED; frompipe = 1; } -@@ -2259,10 +2259,9 @@ static int openPic(filenum) +@@ -2345,10 +2345,9 @@ static int openPic(int filenum) else fullname = namelist[filenum]; #endif @@ -83,7 +72,7 @@ /* chop off trailing ".Z", ".z", or ".gz" from displayed basefname, if any */ if (strlen(basefname)>2 && strcmp(basefname+strlen(basefname)-2,".Z")==0) -@@ -2358,7 +2357,7 @@ static int openPic(filenum) +@@ -2448,7 +2447,7 @@ static int openPic(int filenum) } } @@ -92,7 +81,7 @@ /* if the file is STDIN, write it out to a temp file */ -@@ -2370,7 +2369,7 @@ static int openPic(filenum) +@@ -2460,7 +2459,7 @@ static int openPic(int filenum) #endif #ifndef VMS @@ -101,7 +90,7 @@ #else /* it is VMS */ sprintf(filename, "[]xvXXXXXX"); #endif -@@ -2428,7 +2427,7 @@ static int openPic(filenum) +@@ -2518,7 +2517,7 @@ static int openPic(int filenum) /* if we made a /tmp file (from stdin, etc.) won't need it any more */ if (strcmp(fullname,filename)!=0) unlink(filename); @@ -110,27 +99,9 @@ } else filetype = RFT_ERROR; -@@ -2482,14 +2481,14 @@ static int openPic(filenum) - - filetype = ReadFileType(tmpname); - if (strcmp(fullname,filename)!=0) unlink(filename); -- strcpy(filename, tmpname); -+ strncpy(filename, tmpname, sizeof(filename)-1); - } - ms_auto_no: - #endif /* HAVE_MGCSFX_AUTO */ - - if (filetype == RFT_ERROR) { -- char foostr[512]; -- sprintf(foostr,"Can't open file '%s'\n\n %s.",filename, ERRSTR(errno)); -+ char foostr[256+MAXPATHLEN+1]; -+ snprintf(foostr, sizeof(foostr)-1, "Can't open file '%s'\n\n %s.",filename, ERRSTR(errno)); - - if (!polling) ErrPopUp(foostr, "\nBummer!"); - --- src/xv.h -+++ src/xv.h 2023-05-30 08:48:51.110190986 +0000 -@@ -117,6 +117,9 @@ ++++ src/xv.h 2024-08-13 13:49:08.173562534 +0000 +@@ -118,6 +118,9 @@ # ifndef _LINUX_LIMITS_H # include <linux/limits.h> # endif @@ -140,7 +111,7 @@ # ifndef USLEEP # define USLEEP # endif -@@ -370,9 +373,20 @@ +@@ -371,7 +374,19 @@ #endif #ifndef MAXPATHLEN @@ -150,20 +121,19 @@ +# else +# define MAXPATHLEN 512 +# endif - #endif - ++#endif ++ +#ifndef MAXNAMELEN +# ifdef NAME_MAX +# define MAXNAMELEN NAME_MAX +# else +# define MAXNAMELEN 128 +# endif -+#endif + #endif - #ifdef SVR4 - # define random lrand48 + #define XV_MAXQUOTEDPATHLEN (3 * MAXPATHLEN + 10) --- src/xvpbm.c -+++ src/xvpbm.c 2023-05-30 09:09:45.347497898 +0000 ++++ src/xvpbm.c 2024-08-13 13:51:11.747365804 +0000 @@ -5,6 +5,7 @@ * WritePBM(fp,pic,ptype,w,h,r,g,b,numcols,style,raw,cmt,comment) */ @@ -172,7 +142,7 @@ #include "copyright.h" #include "xv.h" -@@ -234,12 +235,17 @@ static int loadpbm(fp, pinfo, raw) +@@ -229,12 +230,17 @@ static int loadpbm(FILE *fp, PICINFO *pi byte *pic8; byte *pix; int i,j,bit,w,h,npixels; @@ -191,7 +161,7 @@ return pbmError(bname, "image dimensions too large"); pic8 = (byte *) calloc((size_t) npixels, (size_t) 1); -@@ -305,13 +311,17 @@ static int loadpgm(fp, pinfo, raw, maxv) +@@ -297,13 +303,17 @@ static int loadpgm(FILE *fp, PICINFO *pi { byte *pix, *pic8; int i,j,bitshift,w,h,npixels, holdmaxv; @@ -211,7 +181,7 @@ return pbmError(bname, "image dimensions too large"); pic8 = (byte *) calloc((size_t) npixels, (size_t) 1); -@@ -389,13 +399,20 @@ static int loadppm(fp, pinfo, raw, maxv) +@@ -378,13 +388,20 @@ static int loadppm(FILE *fp, PICINFO *pi { byte *pix, *pic24, scale[256]; int i,j,bitshift, w, h, npixels, bufsize, holdmaxv; @@ -233,15 +203,15 @@ return pbmError(bname, "image dimensions too large"); /* allocate 24-bit image */ -@@ -481,6 +498,7 @@ static int loadpam(fp, pinfo, raw, maxv) +@@ -467,6 +484,7 @@ static int loadpam(FILE *fp, PICINFO *pi { byte *p, *pix, *pic24, *linebuf, scale[256], bgR, bgG, bgB, r, g, b, a; - int i, j, bitshift, w, h, npixels, bufsize, linebufsize, holdmaxv; + int i, j, w, h, npixels, bufsize, linebufsize, holdmaxv; + uint64_t bufchk, pixchk, lnbchk; + /* int bitshift; */ w = pinfo->w; - h = pinfo->h; -@@ -488,8 +506,16 @@ static int loadpam(fp, pinfo, raw, maxv) +@@ -475,8 +493,16 @@ static int loadpam(FILE *fp, PICINFO *pi npixels = w * h; bufsize = 3*npixels; linebufsize = 4*w; @@ -261,9 +231,9 @@ /* allocate 24-bit image */ --- 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; ++++ src/xvpcx.c 2024-08-13 13:52:07.662371779 +0000 +@@ -245,7 +245,8 @@ static int pcxLoadImage8(const char *fna + static int pcxLoadImage24(const char *fname, FILE *fp, PICINFO *pinfo, byte *hdr) { byte *pix, *pic24, scale[256]; - int c, i, j, w, h, maxv, cnt, planes, bperlin, nbytes, count; @@ -272,18 +242,4 @@ 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; - - if (strlen(fullfname)) -- sprintf(tv->title, "File: '%s'", BaseName(fullfname)); -+ snprintf(tv->title, TITLELEN-1, "File: '%s'", BaseName(fullfname)); - else -- sprintf(tv->title, "<no file loaded>"); -+ snprintf(tv->title, TITLELEN-1, "<no file loaded>"); - - computeText(tv); /* compute # lines and linestarts array */ - ++++++ xv-3.10a.dif ++++++ --- /var/tmp/diff_new_pack.mK9YaY/_old 2024-08-14 14:13:18.940691293 +0200 +++ /var/tmp/diff_new_pack.mK9YaY/_new 2024-08-14 14:13:18.944691460 +0200 @@ -8,8 +8,8 @@ 6 files changed, 40 insertions(+), 42 deletions(-) --- src/CMakeLists.txt -+++ src/CMakeLists.txt 2024-02-07 10:53:14.907067976 +0000 -@@ -146,17 +146,17 @@ set(man_pages ++++ src/CMakeLists.txt 2024-08-13 13:55:34.654691865 +0000 +@@ -157,17 +157,17 @@ set(man_pages foreach(file ${man_pages}) string(REGEX REPLACE "\\.[^.]*$" "" base ${file}) install( @@ -30,7 +30,7 @@ DESTINATION "${CMAKE_INSTALL_MANDIR}/fi/man1") # Install files into SYSCONFDIR. -@@ -184,7 +184,6 @@ install(FILES +@@ -195,7 +195,6 @@ install(FILES # Install files into DOCDIR/formats. install(FILES docs/formats/bmp.doc @@ -39,7 +39,7 @@ docs/formats/gif89.doc docs/formats/gif.ack --- src/bggen.c -+++ src/bggen.c 2024-02-07 10:53:27.578834066 +0000 ++++ src/bggen.c 2024-08-13 13:55:34.654691865 +0000 @@ -36,7 +36,7 @@ #define MAXCOLS 128 @@ -50,7 +50,7 @@ #endif --- src/config.h -+++ src/config.h 2024-02-07 10:53:27.578834066 +0000 ++++ src/config.h 2024-08-13 13:55:34.654691865 +0000 @@ -14,13 +14,13 @@ * 'which gunzip' to find if you have gunzip, and where it lives; ditto for * gzip) @@ -76,7 +76,7 @@ #endif -@@ -52,7 +52,7 @@ +@@ -67,7 +67,7 @@ * as it tries to be clever on systems where uncompress lives in an unusual * location. */ @@ -85,7 +85,7 @@ #if defined(hpux) || defined(SVR4) || \ defined(__386BSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ -@@ -63,7 +63,7 @@ +@@ -78,7 +78,7 @@ machine has or not. */ # undef UNCOMPRESS @@ -94,7 +94,7 @@ #endif #if defined(sgi) -@@ -113,7 +113,7 @@ +@@ -128,7 +128,7 @@ */ /* #define GS_PATH "/usr/local/bin/gs" */ @@ -103,7 +103,7 @@ /* #define GS_LIB "." */ /* #define GS_DEV "ppmraw" */ -@@ -191,7 +191,7 @@ +@@ -206,7 +206,7 @@ * in the following line. */ @@ -112,7 +112,7 @@ /*************************************************************************** -@@ -207,7 +207,7 @@ +@@ -222,7 +222,7 @@ * is read-only), change 'undef' to 'define' the VIRTUAL_TD line. */ @@ -122,8 +122,8 @@ #if defined(VIRTUAL_TD) && !defined(AUTO_EXPAND) --- src/xv.h -+++ src/xv.h 2024-02-07 10:53:27.582833993 +0000 -@@ -98,12 +98,6 @@ ++++ src/xv.h 2024-08-13 13:55:34.654691865 +0000 +@@ -99,12 +99,6 @@ # define SVR4 #endif @@ -136,7 +136,7 @@ #include <signal.h> /* for interrupt handling */ -@@ -161,16 +155,6 @@ +@@ -162,16 +156,6 @@ #endif @@ -153,7 +153,7 @@ /* include files */ #include <stdio.h> #include <math.h> -@@ -333,7 +317,9 @@ +@@ -334,7 +318,9 @@ # endif #endif @@ -164,7 +164,7 @@ /* Use S_ISxxx macros in stat-related stuff * make them if missing, along with a few fictitious ones -@@ -445,6 +431,12 @@ +@@ -449,6 +435,12 @@ # define SEEK_END 2 #endif @@ -178,8 +178,8 @@ # define strstr(A,B) pds_strstr((A),(B)) # undef S_IFIFO --- src/xvevent.c -+++ src/xvevent.c 2024-02-07 10:53:27.582833993 +0000 -@@ -2671,7 +2671,7 @@ int xvErrorHandler(disp, err) ++++ src/xvevent.c 2024-08-13 13:55:34.654691865 +0000 +@@ -2796,7 +2796,7 @@ int xvErrorHandler(Display *disp, XError /* in case the error occurred during the Grab command... */ XUngrabServer(theDisp); @@ -188,7 +188,7 @@ xerrcode = err->error_code; -@@ -2689,6 +2689,8 @@ int xvErrorHandler(disp, err) +@@ -2814,6 +2814,8 @@ int xvErrorHandler(Display *disp, XError (err->request_code == 113 /* X_KillClient */ ) || (xerrcode == BadLength && err->request_code==18 /* X_ChangeProp */ ) || (xerrcode == BadMatch && err->request_code==73 /* X_GetImage */ ) || @@ -198,7 +198,7 @@ return 0; --- src/xvgrab.c -+++ src/xvgrab.c 2024-02-07 10:53:27.582833993 +0000 ++++ src/xvgrab.c 2024-08-13 13:57:26.644700779 +0000 @@ -12,6 +12,7 @@ #include "copyright.h" @@ -207,7 +207,7 @@ #include "xv.h" /* Allow flexibility in use of buttons JPD */ -@@ -103,7 +104,6 @@ int Grab() +@@ -103,7 +104,6 @@ int Grab(void) else if (ctrlW) CtrlBox(0); } @@ -215,7 +215,7 @@ XSync(theDisp, False); if (grabDelay>0) { /* instead of sleep(), handle events while waiting */ -@@ -133,7 +133,6 @@ int Grab() +@@ -133,7 +133,6 @@ int Grab(void) grabInProgress = 0; } @@ -223,7 +223,7 @@ rootGC = DefaultGC(theDisp, theScreen); if (grabPic) { /* throw away previous 'grabbed' pic, if there is one */ -@@ -149,7 +148,6 @@ int Grab() +@@ -149,7 +148,6 @@ int Grab(void) XRecolorCursor(theDisp, tcross, &fc, &bc); #endif @@ -231,7 +231,7 @@ XBell(theDisp, 0); /* beep once at start of grab */ /* Change cursor to top_left_corner JPD */ -@@ -157,9 +155,6 @@ int Grab() +@@ -157,9 +155,6 @@ int Grab(void) PointerMotionMask|ButtonPressMask|ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, tlcorner, CurrentTime); @@ -241,7 +241,7 @@ if (autograb) { XGrabServer(theDisp); /* until we've done the grabImage */ if (!XQueryPointer(theDisp,rootW,&rW,&cW,&rx,&ry,&x1,&y1,&mask)) { -@@ -172,14 +167,24 @@ int Grab() +@@ -172,14 +167,24 @@ int Grab(void) } else { /* !autograb */ @@ -268,7 +268,7 @@ } /* continue to handle events while waiting... */ -@@ -191,7 +196,7 @@ int Grab() +@@ -191,7 +196,7 @@ int Grab(void) i = HandleEvent(&evt, &done); if (done) { /* only 'new image' cmd accepted=quit */ if (i==QUIT) { @@ -277,7 +277,7 @@ Quit(0); } else XBell(theDisp, 0); -@@ -217,7 +222,7 @@ int Grab() +@@ -217,7 +222,7 @@ int Grab(void) } } @@ -286,8 +286,8 @@ XBell(theDisp, 0); XBell(theDisp, 0); rv = 0; -@@ -489,7 +494,7 @@ static void endflash() - static void ungrabX() +@@ -486,7 +491,7 @@ static void endflash(void) + static void ungrabX(void) { XUngrabServer(theDisp); - XUngrabButton(theDisp, (u_int) AnyButton, 0, rootW);
