On Mon, 1 Feb 2021 00:38:19 +1100
Jonathan Gray <j...@jsg.id.au> wrote:
> On Sun, Jan 31, 2021 at 01:30:19PM +0100, Charlene Wendling wrote:
> > Hi,
> >
> > This fix has been taken from FreeBSD [0]. check_sym reports no
> > dynamic change. This has been built and tested successfully on
> > macppc and amd64.
> >
> > OK?
>
> Is a revision bump strictly needed for this?
As stated in the porting guide: « Anything that affects the binary
package implies a bump. This includes HOMEPAGE, MAINTAINER or
description changes, changes to patches or build flags. »
There are exceptions to this, but when in doubt, it's better to bump.
If you extract the p1 ace package and compare it to p2, you get the
following, showing we should bump revision (if someone has an easier
way to do this, i would be happy to try out):
$ diff -u ace.{orig,new}/+CONTENTS | awk '/^.@(sha|lib|bin|name)/ || /^.[a-z]/'
-@name ace-1.4p1
+@name ace-1.4p2
@bin bin/canfield
@sha FxJ+4ebeIYT29VAoweyphGjWSGQjSsHHEc4HlQ8ykHY=
@bin bin/freecell
@sha ieFkiDSBc2StI2uWXy+5viHg7mvbmLrUK6HJJZ4YWho=
@bin bin/golf
@sha 6A/XiMiKxLFpOBLWl1yYD8k5b2nh93aG/j3T5OWIxE8=
@bin bin/mastermind
@sha V080t6kHmhU64KWGM4LEgfSGcZ8vRW550CVDT1yoG/U=
@bin bin/merlin
@sha 29PgmSv41RETlKjuTXqU3HtO170AIAFYmOftXX9Q3Sw=
@bin bin/minesweeper
@sha b0fyUOEbbdQMvvxmdkdyzlf07bkxNA0/nAi9yQ3hIyE=
@bin bin/pegged
@sha xwBzJCT2ViSVcMZCAtCWgc2cOvPU3ERjMERB+sFkcIc=
@bin bin/penguins
@sha c05np8yPse2w039vvzCoC3ggjsL1ONg2HO+MRoBnLpk=
@bin bin/solitaire
@sha vcTyoA0fhyGxSATvK54rDQk81eS8yuv6pi5WSGvoLOU=
@bin bin/spider
@sha +8qcljp6IZl8o4aFoB6ArnkxIG9d/BkNu0NCiNmgbSQ=
@bin bin/taipedit
-@sha VtXInNZJp3vcqOyRAQVEOZOFIZN+tgfGKV6XTOsuZb4=
+@sha mLXyO3hRYNcIjDrDuYcV4s//rI/mcKv1noFSJKqmL+g=
@bin bin/taipei
-@sha /RCvEK3MYqLA9nfrlMZ+vAvytAhHXy1ua0GlyUbPT24=
+@sha CJg34MSvzRNUzp6ND1cNqGQW4RWSW5JBWl2U5Uc/ND4=
@bin bin/thornq
@sha xGPdJRHJWWlbfazQQnNfuQ1tPlF34tAOOIQqcGEz3II=
lib/libcards.a
-@sha AZ9WtPI/9OEQZFbUxGH074A/L87sXmuBQ+JUuVvrPUQ=
+@sha ZW6cmJaV0GzmvHSKb9d0QJXovsKtoOzMMtCmP1ZhGTI=
lib/libcards.la
@sha KhETIzRiigcLGRlsXwVP42LzPFWmUkX/oADVC3zRO5s=
@lib lib/libcards.so.0.0
-@sha hcmlxe2+4tg08anjTxpXzj6yqZ1cAxODVgMOPrLbup4=
+@sha Fk+bcQ5+DEtXH5hCmj+a3D21FNbBeR3uDkY9EKqojUc=
> ok jsg@
>
> >
> > Charlène.
> >
> >
> > [0] https://github.com/freebsd/freebsd-ports/commit/53cdc659
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/games/ace/Makefile,v
> > retrieving revision 1.5
> > diff -u -p -u -p -r1.5 Makefile
> > --- Makefile 2 Oct 2019 21:11:08 -0000 1.5
> > +++ Makefile 31 Jan 2021 12:18:00 -0000
> > @@ -3,7 +3,7 @@
> > COMMENT = solitaire games
> >
> > DISTNAME = ace-1.4
> > -REVISION = 1
> > +REVISION = 2
> >
> > SHARED_LIBS += cards 0.0 # 1.0
> >
> > Index: patches/patch-lib_table_c
> > ===================================================================
> > RCS file: patches/patch-lib_table_c
> > diff -N patches/patch-lib_table_c
> > --- /dev/null 1 Jan 1970 00:00:00 -0000
> > +++ patches/patch-lib_table_c 31 Jan 2021 12:18:00 -0000
> > @@ -0,0 +1,16 @@
> > +$OpenBSD$
> > +
> > +Fix the build with -fno-common
> > +
> > +Index: lib/table.c
> > +--- lib/table.c.orig
> > ++++ lib/table.c
> > +@@ -57,7 +57,7 @@ static int ex=0, ey=0, ew=0, eh=0;
> > + static int graphics_disabled = 1;
> > +
> > + OptionDesc *app_options;
> > +-OptionDesc *xwin_options;
> > ++extern OptionDesc *xwin_options;
> > + static OptionDesc *options[5];
> > +
> > + static OptionDesc ace_options[] = {
> >
> >
>
