Hello community,
here is the log from the commit of package vitetris for openSUSE:Factory
checked in at 2020-12-17 17:05:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vitetris (Old)
and /work/SRC/openSUSE:Factory/.vitetris.new.5145 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vitetris"
Thu Dec 17 17:05:25 2020 rev:3 rq:856516 version:0.59.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/vitetris/vitetris.changes 2019-03-13
09:13:18.127398675 +0100
+++ /work/SRC/openSUSE:Factory/.vitetris.new.5145/vitetris.changes
2020-12-17 17:09:03.089955761 +0100
@@ -1,0 +2,12 @@
+Sat Dec 12 22:13:10 UTC 2020 - Martin Hauke <mar...@gmx.de>
+
+- Update to version 0.59
+ * Highlight last high score
+ * Change qualification for high score when in B-type
+ * Enhance desktop entry file
+ * Remove explicit ownership for installed files
+ * Add runtime library search path
+- Drop patch:
+ * vitetris-no-need-for-root-to-install.patch
+
+-------------------------------------------------------------------
Old:
----
vitetris-0.58.0.tar.gz
vitetris-no-need-for-root-to-install.patch
New:
----
vitetris-0.59.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vitetris.spec ++++++
--- /var/tmp/diff_new_pack.PiZTwU/_old 2020-12-17 17:09:03.633956301 +0100
+++ /var/tmp/diff_new_pack.PiZTwU/_new 2020-12-17 17:09:03.633956301 +0100
@@ -1,8 +1,8 @@
#
# spec file for package vitetris
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2019, Martin Hauke <mar...@gmx.de>
+# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2019-2020, Martin Hauke <mar...@gmx.de>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
# build with support for allegro - disabled by default
%bcond_with allegro
Name: vitetris
-Version: 0.58.0
+Version: 0.59.0
Release: 0
Summary: Terminal-based Tetris clone
License: BSD-2-Clause
@@ -30,7 +30,6 @@
#Git-Clone: https://github.com/vicgeralds/vitetris.git
Source:
https://github.com/vicgeralds/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: vitetris.6
-Patch5: vitetris-no-need-for-root-to-install.patch
Patch6: vitetris-fix-font-path.patch
%if 0%{with allegro}
BuildRequires: liballeg-devel
@@ -55,7 +54,6 @@
%prep
%setup -q
-%patch5 -p1
%patch6 -p1
sed -i 's|Exec=tetris|Exec=vitetris|' vitetris.desktop
++++++ vitetris-0.58.0.tar.gz -> vitetris-0.59.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/Makefile new/vitetris-0.59.0/Makefile
--- old/vitetris-0.58.0/Makefile 2019-03-10 16:46:22.000000000 +0100
+++ new/vitetris-0.59.0/Makefile 2020-12-12 19:30:49.000000000 +0100
@@ -5,7 +5,7 @@
# Uncomment to change the default. (Only used in Unix-like systems.)
#HISCORE_FILENAME = /var/games/vitetris-hiscores
-INSTALL = install -oroot -groot
+INSTALL = install
default: build
@echo Done.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/configure
new/vitetris-0.59.0/configure
--- old/vitetris-0.58.0/configure 2019-03-10 16:46:22.000000000 +0100
+++ new/vitetris-0.59.0/configure 2020-12-12 19:30:49.000000000 +0100
@@ -326,7 +326,7 @@
fi
done
if [ -n "$libpath" ]; then
- LDFLAGS="$LDFLAGS $libpath"
+ LDFLAGS="$LDFLAGS $libpath -Wl,-R${libpath#-L}"
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/src/cfgfile.c
new/vitetris-0.59.0/src/cfgfile.c
--- old/vitetris-0.58.0/src/cfgfile.c 2019-03-10 16:46:22.000000000 +0100
+++ new/vitetris-0.59.0/src/cfgfile.c 2020-12-12 19:30:49.000000000 +0100
@@ -271,6 +271,8 @@
addopt: addopt(key, val, tp, sect_hd.next);
}
fclose(fp);
+
+ lastscore = getopt_int("", "lastscore");
}
static void writeopts(FILE *fp, const struct sect *sect)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/src/draw/draw.c
new/vitetris-0.59.0/src/draw/draw.c
--- old/vitetris-0.58.0/src/draw/draw.c 2019-03-10 16:46:22.000000000 +0100
+++ new/vitetris-0.59.0/src/draw/draw.c 2020-12-12 19:30:49.000000000 +0100
@@ -231,6 +231,11 @@
pos = 1;
continue;
}
+ if ((unsigned) hs->score == lastscore) {
+ setattr_bold();
+ } else {
+ setattr_normal();
+ }
putch(i+'0');
putch('.');
if (hs->score < 1000000)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/src/game/tetris.c
new/vitetris-0.59.0/src/game/tetris.c
--- old/vitetris-0.58.0/src/game/tetris.c 2019-03-10 16:46:22.000000000
+0100
+++ new/vitetris-0.59.0/src/game/tetris.c 2020-12-12 19:30:49.000000000
+0100
@@ -124,6 +124,7 @@
lines = p->lineslimit - p->lines;
if (p->lines <= 0) {
p->lines = 0;
+ // This ends the game!
p->piece.y = -1;
}
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/src/hiscore.c
new/vitetris-0.59.0/src/hiscore.c
--- old/vitetris-0.58.0/src/hiscore.c 2019-03-10 16:46:22.000000000 +0100
+++ new/vitetris-0.59.0/src/hiscore.c 2020-12-12 19:30:49.000000000 +0100
@@ -5,9 +5,12 @@
#include "lang.h"
#include "game/tetris.h"
#include "config.h"
+#include "options.h"
struct hiscore hiscores[10] = {{"", 0}};
+unsigned lastscore = 0;
+
static const char last_chars[8] = "Z���!?�";
void writehiscores(FILE *fp);
@@ -304,6 +307,14 @@
#endif
}
+static void save_last_score(const struct hiscore *hs)
+{
+ union val value;
+ readoptions();
+ value.integ = (lastscore = hs->score);
+ setoption("", "lastscore", value, 0);
+}
+
int savehiscore(const char *name)
{
struct hiscore hs;
@@ -321,6 +332,7 @@
hs.level = player1.level;
hs.lines = player1.lines;
addhiscore(&hs);
+ save_last_score(&hs);
n = writeconfig();
return (savehiscores_global() || n);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/src/hiscore.h
new/vitetris-0.59.0/src/hiscore.h
--- old/vitetris-0.58.0/src/hiscore.h 2019-03-10 16:46:22.000000000 +0100
+++ new/vitetris-0.59.0/src/hiscore.h 2020-12-12 19:30:49.000000000 +0100
@@ -9,7 +9,9 @@
short lines;
} hiscores[10];
-#define ishiscore() (player1.score >= 12000 && \
+extern unsigned lastscore;
+
+#define ishiscore() (((game->mode & MODE_BTYPE) ? player1.lines == 0 :
player1.score >= 12000) && \
player1.score > hiscores[9].score)
int readhiscores(const char *filename);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/src/menu/gameover.c
new/vitetris-0.59.0/src/menu/gameover.c
--- old/vitetris-0.58.0/src/menu/gameover.c 2019-03-10 16:46:22.000000000
+0100
+++ new/vitetris-0.59.0/src/menu/gameover.c 2020-12-12 19:30:49.000000000
+0100
@@ -24,6 +24,11 @@
hs += i;
end = hs+5;
while (hs->score && hs != end) {
+ if ((unsigned) hs->score == lastscore) {
+ setattr_bold();
+ } else {
+ setattr_normal();
+ }
n = sprintf(s, "%2d. %s", i+1, gethiscorename(i, s+12));
memset(s+n, ' ', 12-n);
sprintf(s+12, "%7ld", (long) hs->score);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/src/options.c
new/vitetris-0.59.0/src/options.c
--- old/vitetris-0.58.0/src/options.c 2019-03-10 16:46:22.000000000 +0100
+++ new/vitetris-0.59.0/src/options.c 2020-12-12 19:30:49.000000000 +0100
@@ -126,8 +126,13 @@
int getopt_int(const char *sect_name, const char *key)
{
struct option *o = get_opt(sect_name, key);
- if (o)
+ if (o) {
+ const char *s = opt_longstr(o);
+ if (s) {
+ return atoi(s);
+ }
return o->val.integ;
+ }
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/src/version.h
new/vitetris-0.59.0/src/version.h
--- old/vitetris-0.58.0/src/version.h 2019-03-10 16:46:22.000000000 +0100
+++ new/vitetris-0.59.0/src/version.h 2020-12-12 19:30:49.000000000 +0100
@@ -1,4 +1,4 @@
-#define VERSION_NO "0.58.0"
-#define VERSION_DATE "20190310"
+#define VERSION_NO "0.59.0"
+#define VERSION_DATE "20201212"
#define VITETRIS_VER "vitetris "VERSION_NO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vitetris-0.58.0/vitetris.desktop
new/vitetris-0.59.0/vitetris.desktop
--- old/vitetris-0.58.0/vitetris.desktop 2019-03-10 16:46:22.000000000
+0100
+++ new/vitetris-0.59.0/vitetris.desktop 2020-12-12 19:30:49.000000000
+0100
@@ -1,9 +1,10 @@
[Desktop Entry]
Type=Application
-Encoding=UTF-8
Name=vitetris
GenericName=Text-mode Tetris
Exec=tetris -w 80
Icon=vitetris
Categories=Game;BlocksGame;
Terminal=true
+Comment=Terminal-based Tetris game
+Keywords=game;tetris;terminal;blocks_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
