On 02/05, Thomas Frohwein wrote:
> On Fri, Apr 19, 2024 at 10:07:28PM +0200, Solene Rapenne wrote:
> > this updates brogue to latest version, it introduces a quick game
> > mode
> >
> > the Recordings.c patch isn't needed, upstream is now casting the
> > variable to unsigned long long instead of our long long, I guess
> > it's good enough to drop the patch?
> >
> > the -Wformat-overflow=0 part in the Makefile was also dropped
> > upstream.
>
> The update looks good to me, I've built it and launched the game
> successfully. Any word from maintainer? ok thfr@ for the update in this
> form.
>
> >
> > diff --git a/games/brogue/Makefile b/games/brogue/Makefile
> > index 7135bf18124..a73c8e05c4f 100644
> > --- a/games/brogue/Makefile
> > +++ b/games/brogue/Makefile
> > @@ -3,7 +3,7 @@ COMMENT-no_x11 = roguelike game by Brian Walker
> >
> > GH_ACCOUNT = tmewett
> > GH_PROJECT = BrogueCE
> > -GH_TAGNAME = v1.12
> > +GH_TAGNAME = v1.13
> >
> > PKGNAME = brogue-${GH_TAGNAME:S/v//}
> >
> > diff --git a/games/brogue/distinfo b/games/brogue/distinfo
> > index 6bed27b849e..71416d88ad5 100644
> > --- a/games/brogue/distinfo
> > +++ b/games/brogue/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (BrogueCE-1.12.tar.gz) =
> > ru0/bKD041ITewGW6d3b3OVCqemd2p7/2RXgGJI81Cg=
> > -SIZE (BrogueCE-1.12.tar.gz) = 1168482
> > +SHA256 (BrogueCE-1.13.tar.gz) =
> > TGPpFjmQLVhWWrPChS2JpCBs3WAgC1hfqdk9aliBkGw=
> > +SIZE (BrogueCE-1.13.tar.gz) = 1294988
> > diff --git a/games/brogue/patches/patch-Makefile
> > b/games/brogue/patches/patch-Makefile
> > index baef5747b1f..c7a2949a183 100644
> > --- a/games/brogue/patches/patch-Makefile
> > +++ b/games/brogue/patches/patch-Makefile
> > @@ -4,21 +4,12 @@
> > Index: Makefile
> > --- Makefile.orig
> > +++ Makefile
> > -@@ -2,7 +2,7 @@ include config.mk
> > -
> > - cflags := -Isrc/brogue -Isrc/platform -std=c99 \
> > - -Wall -Wpedantic -Werror=implicit -Wno-parentheses -Wno-unused-result \
> > -- -Wformat -Werror=format-security -Wformat-overflow=0
> > -+ -Wformat -Werror=format-security
> > - libs := -lm
> > - cppflags := -DDATADIR=$(DATADIR)
> > -
> > -@@ -41,7 +41,7 @@ ifeq ($(DEBUG),YES)
> > - cflags += -g -Og
> > - cppflags += -DENABLE_PLAYBACK_SWITCH
> > +@@ -62,7 +62,7 @@ ifeq ($(DEBUG),YES)
> > + cflags += -g -Og
> > + cppflags += -DENABLE_PLAYBACK_SWITCH
> > else
> > -- cflags += -O2
> > -+ cflags +=
> > +-cflags += -O2
> > ++cflags +=
> > endif
> >
> > - objects := $(sources:.c=.o)
> > + # Add user-provided flags.
> > diff --git a/games/brogue/patches/patch-src_brogue_Recordings_c
> > b/games/brogue/patches/patch-src_brogue_Recordings_c
> > deleted file mode 100644
> > index f173d23598b..00000000000
> > --- a/games/brogue/patches/patch-src_brogue_Recordings_c
> > +++ /dev/null
> > @@ -1,18 +0,0 @@
> > -cast int64_t to long long for printing
> > -
> > -Index: src/brogue/Recordings.c
> > ---- src/brogue/Recordings.c.orig
> > -+++ src/brogue/Recordings.c
> > -@@ -1454,10 +1454,10 @@ void parseFile() {
> > - numDepths = recallNumber(4);
> > - fileLength = recallNumber(4);
> > -
> > -- fprintf(descriptionFile, "Parsed file \"%s\":\n\tVersion:
> > %s\n\tSeed: %li\n\tNumber of turns: %li\n\tNumber of depth changes:
> > %li\n\tFile length: %li\n",
> > -+ fprintf(descriptionFile, "Parsed file \"%s\":\n\tVersion:
> > %s\n\tSeed: %lli\n\tNumber of turns: %li\n\tNumber of depth changes:
> > %li\n\tFile length: %li\n",
> > - currentFilePath,
> > - versionString,
> > -- seed,
> > -+ (long long)seed,
> > - numTurns,
> > - numDepths,
> > - fileLength);
> >
>
Sorry for delay.
Everything looks good. Thank you, Solene, for the update,
and Omar for upstreaming patch.
