Hello community,
here is the log from the commit of package kpat for openSUSE:Factory checked in at 2018-04-27 16:05:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kpat (Old)
and /work/SRC/openSUSE:Factory/.kpat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpat"
Fri Apr 27 16:05:29 2018 rev:73 rq:599092 version:18.04.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kpat/kpat.changes 2018-03-22 12:03:19.529528403 +0100
+++ /work/SRC/openSUSE:Factory/.kpat.new/kpat.changes 2018-04-27 16:05:57.445696424 +0200
@@ -1,0 +2,20 @@
+Wed Apr 18 07:49:40 CEST 2018 - lbeltrame@kde.org
+
+- Update to 18.04.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.04.0.php
+- Changes since 18.03.90:
+ * None
+
+-------------------------------------------------------------------
+Fri Apr 06 07:09:52 CEST 2018 - lbeltrame@kde.org
+
+- Update to 18.03.90
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.03.90.php
+- Changes since 17.12.3:
+ * Summary: SpiderSolitaire: Check if there exists a card below before accessing it (kde#389540)
+
+-------------------------------------------------------------------
Old:
----
kpat-17.12.3.tar.xz
New:
----
kpat-18.04.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpat.spec ++++++
--- /var/tmp/diff_new_pack.XnPH6i/_old 2018-04-27 16:05:58.345663409 +0200
+++ /var/tmp/diff_new_pack.XnPH6i/_new 2018-04-27 16:05:58.345663409 +0200
@@ -19,7 +19,7 @@
%bcond_without lang
Name: kpat
-Version: 17.12.3
+Version: 18.04.0
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
++++++ kpat-17.12.3.tar.xz -> kpat-18.04.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-17.12.3/mimetypes/kpatience.xml new/kpat-18.04.0/mimetypes/kpatience.xml
--- old/kpat-17.12.3/mimetypes/kpatience.xml 2018-02-08 06:59:47.000000000 +0100
+++ new/kpat-18.04.0/mimetypes/kpatience.xml 2018-04-03 06:15:44.000000000 +0200
@@ -15,7 +15,7 @@
<comment xml:lang="fi">Vanha KPatience-tallennustiedosto</comment>
<comment xml:lang="fr">Fichier de partie KPatience dans l'ancien format</comment>
<comment xml:lang="gl">Ficheiro de partida dunha versión antiga de KPatience</comment>
- <comment xml:lang="id">Berkas simpanan warisan KPatience</comment>
+ <comment xml:lang="id">File simpanan warisan KPatience</comment>
<comment xml:lang="it">File di salvataggio obsoleto per KPatience</comment>
<comment xml:lang="ko">KPatience 레거시 저장 파일</comment>
<comment xml:lang="nl">KPatience ouderwets opslagbestand</comment>
@@ -56,7 +56,7 @@
<comment xml:lang="fi">KPatience-tallennustiedosto</comment>
<comment xml:lang="fr">Fichier de partie KPatience</comment>
<comment xml:lang="gl">Ficheiro de partida de KPatience</comment>
- <comment xml:lang="id">Berkas simpanan KPatience</comment>
+ <comment xml:lang="id">File simpanan KPatience</comment>
<comment xml:lang="it">File di salvataggio per KPatience</comment>
<comment xml:lang="ko">KPatience 저장 파일</comment>
<comment xml:lang="nl">KPatience opslagbestand</comment>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-17.12.3/org.kde.kpat.desktop new/kpat-18.04.0/org.kde.kpat.desktop
--- old/kpat-17.12.3/org.kde.kpat.desktop 2018-02-08 06:59:47.000000000 +0100
+++ new/kpat-18.04.0/org.kde.kpat.desktop 2018-04-03 06:15:44.000000000 +0200
@@ -139,7 +139,6 @@
Comment[pl]=Gra pasjans
Comment[pt]=Jogo de cartas solitário
Comment[pt_BR]=Jogo de cartas paciência
-Comment[sk]=Kartová hra Solitaire
Comment[sl]=Igra Pasjanse
Comment[sr]=Игра пасијанса
Comment[sr@ijekavian]=Игра пасијанса
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-17.12.3/patsolve/mod3solver.cpp new/kpat-18.04.0/patsolve/mod3solver.cpp
--- old/kpat-17.12.3/patsolve/mod3solver.cpp 2018-02-08 06:59:47.000000000 +0100
+++ new/kpat-18.04.0/patsolve/mod3solver.cpp 2018-04-03 06:15:44.000000000 +0200
@@ -122,6 +122,12 @@
len = 8;
for ( int i = len; i >= 0; i-- )
{
+ if (Wlen[i] == 0) {
+ // there exists no card to move
+ /* TODO: determine if we need to call hashpile here
+ / or do any other work */
+ continue;
+ }
card_t card = *Wp[24+i];
Wlen[deck]++;
Wp[deck]++;
@@ -249,7 +255,12 @@
if ( Wlen[i] == Wlen[j] + 1 )
continue;
}
- mp->pri = qMin(119, 12 + 20 * Wlen[j] + current_row * 2 + RANK(*Wp[j]) * 5);
+
+ if (Wlen[j]) {
+ mp->pri = qMin(119, 12 + 20 * Wlen[j] + current_row * 2 + RANK(*Wp[j]) * 5);
+ } else {
+ mp->pri = 119; // TODO: Find out if this is really correct. We can certainly not touch Wp[j], b ut is this the correct mp->pri value?
+ }
mp->turn_index = -1;
if ( i >= 24 && Wlen[i] == 1 && Wlen[deck] )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-17.12.3/patsolve/spidersolver.cpp new/kpat-18.04.0/patsolve/spidersolver.cpp
--- old/kpat-17.12.3/patsolve/spidersolver.cpp 2018-02-08 06:59:47.000000000 +0100
+++ new/kpat-18.04.0/patsolve/spidersolver.cpp 2018-04-03 06:15:44.000000000 +0200
@@ -310,6 +310,7 @@
bool wasempty = false;
for (int j = 0; j < 10; ++j)
{
+
if (i == j)
continue;
@@ -345,7 +346,8 @@
printcard( card, stderr );
fprintf( stderr, "%d %d %d %d %d\n", i, j, conti[i], conti[j],l );
#endif
- if ( SUIT( card ) != SUIT( *Wp[j] ) )
+ bool card_stack_j_not_empty = Wlen[j] > 0;
+ if (card_stack_j_not_empty && SUIT( card ) != SUIT( *Wp[j] ) )
{
//fprintf( stderr, "continue %d %d %d %d\n",conti[j]+l, conti[i],conti[j]+l, SUIT( card ) != SUIT( *Wp[j] ) );
continue;
@@ -383,8 +385,16 @@
else {
if ( conti[j]+l+1 != 13 || conti[i]>conti[j]+l )
{
- card_t card_below = W[i][Wlen[i]-l-2];
- if ( SUIT( card_below ) != SUIT( card ) || RANK(card_below) != RANK(card) + 1 )
+ card_t card_below;
+ bool exists_card_below = Wlen[i] >= l + 2;
+ if (exists_card_below) {
+ card_below = W[i][Wlen[i]-l-2];
+ }
+ if ( !exists_card_below || ( exists_card_below &&
+ ( SUIT( card_below ) != SUIT( card ) ||
+ RANK(card_below) != RANK(card) + 1 )
+ )
+ )
{
foundgood = true;
} else {
@@ -426,6 +436,9 @@
n++;
mp++;
+ if (n >= MAXMOVES) {
+ goto cannot_store_any_more_moves;
+ }
}
}
}
@@ -446,6 +459,8 @@
break; // one is enough
}
+cannot_store_any_more_moves:
+
if ( n > toomuch && foundgood)
{
mp = Possible;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-17.12.3/po/ca/kpat.po new/kpat-18.04.0/po/ca/kpat.po
--- old/kpat-17.12.3/po/ca/kpat.po 2018-03-06 01:20:57.000000000 +0100
+++ new/kpat-18.04.0/po/ca/kpat.po 2018-04-13 02:09:45.000000000 +0200
@@ -738,3 +738,6 @@
#, kde-format
msgid "Yukon"
msgstr "Yukon"
+
+#~ msgid "Opening file failed."
+#~ msgstr "Ha fallat en obrir el fitxer."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-17.12.3/po/ca@valencia/kpat.po new/kpat-18.04.0/po/ca@valencia/kpat.po
--- old/kpat-17.12.3/po/ca@valencia/kpat.po 2018-03-06 01:20:57.000000000 +0100
+++ new/kpat-18.04.0/po/ca@valencia/kpat.po 2018-04-13 02:09:45.000000000 +0200
@@ -57,7 +57,7 @@
#: dealer.cpp:100
#, kde-format
msgid "Solver: This game cannot be won."
-msgstr "Solucionador: esta partida no es pot guanyar."
+msgstr "Solucionador: aquesta partida no es pot guanyar."
#: dealer.cpp:102
#, kde-format
@@ -77,7 +77,7 @@
#: dealer.cpp:1341
#, kde-format
msgid "Solver: This game is lost."
-msgstr "Solucionador: esta partida està perduda."
+msgstr "Solucionador: aquesta partida està perduda."
#: dealer.cpp:1496
#, kde-format
@@ -738,3 +738,6 @@
#, kde-format
msgid "Yukon"
msgstr "Yukon"
+
+#~ msgid "Opening file failed."
+#~ msgstr "Ha fallat en obrir el fitxer."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-17.12.3/po/gl/kpat.po new/kpat-18.04.0/po/gl/kpat.po
--- old/kpat-17.12.3/po/gl/kpat.po 2018-03-06 01:20:58.000000000 +0100
+++ new/kpat-18.04.0/po/gl/kpat.po 2018-04-13 02:09:45.000000000 +0200
@@ -60,7 +60,7 @@
#: dealer.cpp:102
#, kde-format
msgid "Solver: Unable to determine if this game is winnable."
-msgstr "Solucionador: Non é posíbel determinar se se pode gañar esta partida."
+msgstr "Solucionador: Non se pode determinar se se pode gañar esta partida."
#: dealer.cpp:995
#, kde-format
@@ -587,7 +587,7 @@
#: mainwindow.cpp:978
#, kde-format
msgid "Unable to create temporary file. Saving failed."
-msgstr "Non foi posíbel crear o ficheiro temporal. Fallou a garda."
+msgstr "Non se pode crear o ficheiro temporal. Fallou a garda."
#: mainwindow.cpp:999
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-17.12.3/po/id/kpat.po new/kpat-18.04.0/po/id/kpat.po
--- old/kpat-17.12.3/po/id/kpat.po 2018-03-06 01:20:58.000000000 +0100
+++ new/kpat-18.04.0/po/id/kpat.po 2018-04-13 02:09:46.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-10-23 03:06+0200\n"
-"PO-Revision-Date: 2018-01-16 21:31+0700\n"
+"PO-Revision-Date: 2018-04-03 06:37+0700\n"
"Last-Translator: Wantoyo
participants (1)
-
root@hilbert.suse.de