On Fri, Jul 23 2021, Charlene Wendling <juliana...@posteo.jp> wrote: > Hi, > > Here is an update for grip to 4.2.2. Upstream changes: > > --8<-- > v4.2.2 2021-07-07 > * Patch from D. J. Slattery: fix crash on startup due to invalid > pointer > v4.2.1 2021-05-30 > * Translation updates: Italian > * Update documentation, IRC moving from Freenode to Libera > -->8-- > > Port-wise, it's a simple update, i've just updated WANTLIB, and added > x11/gtk+3,-guic in RUN_DEPENDS as portcheck warned.
LGTM > I also added a fix to ensure the runtime is fine on unsigned char archs > when starting ripping with no track selected and a M3U playlist > already exists. LGTM > The port has been tested on amd64 and macppc. I can't test it. > Comments/feedback are welcome, ok jca@ ports-wise > Charlène. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/audio/grip/Makefile,v > retrieving revision 1.69 > diff -u -p -u -p -r1.69 Makefile > --- Makefile 24 Jan 2021 18:24:27 -0000 1.69 > +++ Makefile 23 Jul 2021 21:43:07 -0000 > @@ -2,7 +2,7 @@ > > COMMENT= front-end to external cd audio rippers and mp3 encoders > > -DISTNAME= grip-4.2.0 > +DISTNAME= grip-4.2.2 > CATEGORIES= audio > > HOMEPAGE= http://sourceforge.net/projects/grip/ > @@ -15,8 +15,9 @@ WANTLIB += Xfixes Xi Xinerama Xrandr Xre > WANTLIB += cdda_paranoia crypto curl expat ffi fontconfig freetype > WANTLIB += fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 > WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gtk-x11-2.0 harfbuzz > -WANTLIB += iconv id3 intl m nghttp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 > -WANTLIB += pcre pixman-1 png ssl xcb xcb-render xcb-shm z > +WANTLIB += iconv id3 intl jpeg m nghttp2 pango-1.0 pangocairo-1.0 > +WANTLIB += pangoft2-1.0 pcre pixman-1 png ssl xcb xcb-render xcb-shm > +WANTLIB += z > > COMPILER= base-clang ports-gcc base-gcc > > @@ -31,7 +32,8 @@ LIB_DEPENDS= audio/cdparanoia \ > net/curl \ > x11/gtk+2 > > -RUN_DEPENDS= audio/vorbis-tools > +RUN_DEPENDS= audio/vorbis-tools \ > + x11/gtk+3,-guic > > BUILD_DEPENDS= devel/gettext,-tools > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/audio/grip/distinfo,v > retrieving revision 1.11 > diff -u -p -u -p -r1.11 distinfo > --- distinfo 24 Jan 2021 18:24:27 -0000 1.11 > +++ distinfo 23 Jul 2021 21:43:07 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (grip-4.2.0.tar.gz) = moU7VED4NxVUm6S9BkWdYxPBf5bb/7zAkyKCx1ucJeo= > -SIZE (grip-4.2.0.tar.gz) = 1209972 > +SHA256 (grip-4.2.2.tar.gz) = nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE= > +SIZE (grip-4.2.2.tar.gz) = 1210481 > Index: patches/patch-src_rip_c > =================================================================== > RCS file: /cvs/ports/audio/grip/patches/patch-src_rip_c,v > retrieving revision 1.8 > diff -u -p -u -p -r1.8 patch-src_rip_c > --- patches/patch-src_rip_c 24 Jan 2021 18:24:27 -0000 1.8 > +++ patches/patch-src_rip_c 23 Jul 2021 21:43:07 -0000 > @@ -1,7 +1,11 @@ > $OpenBSD: patch-src_rip_c,v 1.8 2021/01/24 18:24:27 ajacoutot Exp $ > > ---- src/rip.c.orig Thu Apr 15 20:21:15 2004 > -+++ src/rip.c Tue May 13 16:15:31 2008 > +Hunk #2: ensure EOF is properly detected on archs where char is unsigned > + (powerpc and arm*) > + > +Index: src/rip.c > +--- src/rip.c.orig > ++++ src/rip.c > @@ -27,7 +27,7 @@ > #elif defined (HAVE_SYS_VFS_H) > #include <sys/vfs.h> > @@ -11,3 +15,12 @@ $OpenBSD: patch-src_rip_c,v 1.8 2021/01/ > #include <sys/param.h> > #include <sys/mount.h> > #endif > +@@ -663,7 +663,7 @@ void RemoveM3U(GripInfo *ginfo) > + { > + FILE *fp; > + EncodeTrack enc_track; > +- char testchar; > ++ int testchar; > + GString *str; > + > + if (!ginfo->have_disc) > <#secure method=pgpmime mode=sign> -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
