Upstream version 30.0

5 files changed, 119 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff6fd5d8ae8f..7f74eed84276 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = pzl_games
 	pkgdesc = Collection of puzzle games.
-	pkgver = 27.0
+	pkgver = 30.0
 	pkgrel = 1
 	url = http://pzl.org.uk/
 	arch = any
 	license = GPL
-	source = http://pzl.org.uk/pzl3_27_0.zip
+	source = http://pzl.org.uk/pzl3_30_0.zip
 	source = pzl_ajs.desktop
 	source = pzl_akari.desktop
 	source = pzl_arrowsudoku.desktop
@@ -22,25 +22,28 @@ pkgbase = pzl_games
 	source = pzl_jigsaw.desktop
 	source = pzl_jigsawsudoku.desktop
 	source = pzl_kakuro.desktop
+	source = pzl_knotty.desktop
 	source = pzl_marupeke.desktop
 	source = pzl_masyu.desktop
 	source = pzl_minesweeper.desktop
 	source = pzl_numberlink.desktop
 	source = pzl_nurikabe.desktop
-	source = pzl_scrabbler.desktop
-	source = pzl_skyscrapers.desktop
 	source = pzl_othello.desktop
 	source = pzl_ripple.desktop
+	source = pzl_scrabbler.desktop
+	source = pzl_shakashaka.desktop
 	source = pzl_shikaku.desktop
+	source = pzl_skyscrapers.desktop
 	source = pzl_sokoban.desktop
 	source = pzl_sudoku.desktop
 	source = pzl_suguru.desktop
 	source = pzl_sumpuzzle.desktop
 	source = pzl_targets.desktop
 	source = pzl_tetrofit.desktop
-	source = pzl_wordwheel.desktop
 	source = pzl_wordladder.desktop
-	md5sums = 7399dc833388312a9efd56bdae684239
+	source = pzl_wordwheel.desktop
+	source = pzl_wordy.desktop
+	md5sums = a74f87bdf41f4ba2cfd0ecf0042bf736
 	md5sums = 6f5058e263976d69a2eb356ca2c2a6b5
 	md5sums = 37af6d1fa020f7fa532a69a0e07b32ad
 	md5sums = a1e25c7621e92598bcdb8d442133031a
@@ -57,24 +60,27 @@ pkgbase = pzl_games
 	md5sums = 00333ad5a67aa529189cb8d5efce7ec2
 	md5sums = fa5438c87ada71ae5bdf2edd84df4290
 	md5sums = 27c7b30bf6c9365397b35d4cca7044f8
+	md5sums = a4c525712f146e3be090a25b01cf3242
 	md5sums = cf9a1d524f7e5563c37413f0227fe1a1
 	md5sums = 0ff3ac0767cd8fc94388ef3b301c8adc
 	md5sums = 3938559de7b10ca25f86ccb59676547e
 	md5sums = ab1d907a83c8b7e359eff308ee89d9d9
 	md5sums = 08f441dcf7ec24f4148d9a952738d7f4
-	md5sums = bdcdc0250d61c33f85289e7e436546a6
-	md5sums = ff0b346ce08dc773cdd7f96d8f640ab8
 	md5sums = b56963fa4b72c8b93e799ed25055a3b4
 	md5sums = d1eea30878b0028a5a5e36a0b0158b81
+	md5sums = bdcdc0250d61c33f85289e7e436546a6
+	md5sums = ab72a7b572307731ba3647e2f1e6d6fa
 	md5sums = 38dc1f1869c03d4cc8e2724e6060fc65
+	md5sums = ff0b346ce08dc773cdd7f96d8f640ab8
 	md5sums = ea71834e6c8ab194e38738b599a3e351
 	md5sums = 068873d936f6592065010b056da87cc7
 	md5sums = 0c1b99051ab88c9aacf108a4d7d577e2
 	md5sums = 652ec7a6aa6a225f62579a315bd98421
 	md5sums = 1c6a099a8b6fff65b9856eb8baab784f
 	md5sums = adf64f6092e1d05aafb1bc0c093d56b2
-	md5sums = b7b52cd6e554eb01aa0537bb5526e297
 	md5sums = b0afcb5b6a3f2f05b8fd8e6d59d8e6ca
+	md5sums = b7b52cd6e554eb01aa0537bb5526e297
+	md5sums = fbf0b094c7d61bbce4ab78b9d408de2e
 
 pkgname = pzl_common
 	pkgdesc = Common files for pzl games.
@@ -162,6 +168,11 @@ pkgname = pzl_kakuro
 	url = http://pzl.org.uk/kakuro.html
 	depends = pzl_common
 
+pkgname = pzl_knotty
+	pkgdesc = Logic game similar to Josh Wardle's Wordle.
+	url = http://pzl.org.uk/knotty.html
+	depends = pzl_common
+
 pkgname = pzl_marupeke
 	pkgdesc = Puzzle where there is a potential for three symbols to be adjacent. And block them.
 	url = http://pzl.org.uk/marupeke.html
@@ -187,16 +198,6 @@ pkgname = pzl_nurikabe
 	url = http://pzl.org.uk/nurikabe.html
 	depends = pzl_common
 
-pkgname = pzl_scrabbler
-	pkgdesc = Make words on the board using randomly allotted letters.
-	url = http://pzl.org.uk/scrabbler.html
-	depends = pzl_common
-
-pkgname = pzl_skyscrapers
-	pkgdesc = Logic game which like Sudoku is based around Latin squares.
-	url = http://pzl.org.uk/skyscrapers.html
-	depends = pzl_common
-
 pkgname = pzl_othello
 	pkgdesc = Also known as Reversi. Flip the opponents disk.
 	url = http://pzl.org.uk/othello.html
@@ -207,11 +208,26 @@ pkgname = pzl_ripple
 	url = http://pzl.org.uk/ripple.html
 	depends = pzl_common
 
+pkgname = pzl_scrabbler
+	pkgdesc = Make words on the board using randomly allotted letters.
+	url = http://pzl.org.uk/scrabbler.html
+	depends = pzl_common
+
+pkgname = pzl_shakashaka
+	pkgdesc = Puzzle to place triangles into the white cells.
+	url = http://pzl.org.uk/shakashaka.html
+	depends = pzl_common
+
 pkgname = pzl_shikaku
 	pkgdesc = Draw non-overlapping rectangles around the clue cells to completely cover the grid by rectangles.
 	url = http://pzl.org.uk/shikaku.html
 	depends = pzl_common
 
+pkgname = pzl_skyscrapers
+	pkgdesc = Logic game which like Sudoku is based around Latin squares.
+	url = http://pzl.org.uk/skyscrapers.html
+	depends = pzl_common
+
 pkgname = pzl_sokoban
 	pkgdesc = The warehouse keeper must push boxes to designated positions.
 	url = http://pzl.org.uk/sokoban.html
@@ -242,13 +258,17 @@ pkgname = pzl_tetrofit
 	url = http://pzl.org.uk/tetrofit.html
 	depends = pzl_common
 
+pkgname = pzl_wordladder
+	pkgdesc = Series of words, one above the other, each word differs by one letter.
+	url = http://pzl.org.uk/wordladder.html
+	depends = pzl_common
+
 pkgname = pzl_wordwheel
 	pkgdesc = Puzzle of words scrambled in a circle.
 	url = http://pzl.org.uk/wordwheel.html
 	depends = pzl_common
 
-pkgname = pzl_wordladder
-	pkgdesc = Series of words, one above the other, each word differs by one letter.
-	url = http://pzl.org.uk/wordladder.html
+pkgname = pzl_wordy
+	pkgdesc = Word game based on Wordle and Absurdle.
+	url = http://pzl.org.uk/wordy.html
 	depends = pzl_common
-
diff --git a/PKGBUILD b/PKGBUILD
index 256f6ac426d9..ad97ff6275bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: SanskritFritz (gmail)
 
-pkgname=(pzl_common pzl_ajs pzl_akari pzl_arrowsudoku pzl_binary pzl_boggle pzl_bridges pzl_codeword pzl_fillomino pzl_follow_123 pzl_futoshiki pzl_gol pzl_hidato pzl_hitori pzl_jigsaw pzl_jigsawsudoku pzl_kakuro pzl_marupeke pzl_masyu pzl_minesweeper pzl_numberlink pzl_nurikabe pzl_scrabbler pzl_skyscrapers pzl_othello pzl_ripple pzl_shikaku pzl_sokoban pzl_sudoku pzl_suguru pzl_sumpuzzle pzl_targets pzl_tetrofit pzl_wordwheel pzl_wordladder)
+pkgname=(pzl_common pzl_ajs pzl_akari pzl_arrowsudoku pzl_binary pzl_boggle pzl_bridges pzl_codeword pzl_fillomino pzl_follow_123 pzl_futoshiki pzl_gol pzl_hidato pzl_hitori pzl_jigsaw pzl_jigsawsudoku pzl_kakuro pzl_knotty pzl_marupeke pzl_masyu pzl_minesweeper pzl_numberlink pzl_nurikabe pzl_othello pzl_ripple pzl_scrabbler pzl_shakashaka pzl_shikaku pzl_skyscrapers pzl_sokoban pzl_sudoku pzl_suguru pzl_sumpuzzle pzl_targets pzl_tetrofit pzl_wordladder pzl_wordwheel pzl_wordy)
 pkgbase="pzl_games"
-pkgver=27.0
-_pkgver=27_0
+pkgver=30.0
+_pkgver=30_0
 pkgrel=1
 pkgdesc="Collection of puzzle games."
 arch=('any')
@@ -26,26 +26,29 @@ source=("http://pzl.org.uk/pzl3_$_pkgver.zip"
         "pzl_jigsaw.desktop"
         "pzl_jigsawsudoku.desktop"
         "pzl_kakuro.desktop"
+        "pzl_knotty.desktop"
         "pzl_marupeke.desktop"
         "pzl_masyu.desktop"
         "pzl_minesweeper.desktop"
         "pzl_numberlink.desktop"
         "pzl_nurikabe.desktop"
-        "pzl_scrabbler.desktop"
-        "pzl_skyscrapers.desktop"
         "pzl_othello.desktop"
         "pzl_ripple.desktop"
+        "pzl_scrabbler.desktop"
+        "pzl_shakashaka.desktop"
         "pzl_shikaku.desktop"
+        "pzl_skyscrapers.desktop"
         "pzl_sokoban.desktop"
         "pzl_sudoku.desktop"
         "pzl_suguru.desktop"
         "pzl_sumpuzzle.desktop"
         "pzl_targets.desktop"
         "pzl_tetrofit.desktop"
+        "pzl_wordladder.desktop"
         "pzl_wordwheel.desktop"
-        "pzl_wordladder.desktop")
+        "pzl_wordy.desktop")
 
-md5sums=('7399dc833388312a9efd56bdae684239'
+md5sums=('a74f87bdf41f4ba2cfd0ecf0042bf736'
          '6f5058e263976d69a2eb356ca2c2a6b5'
          '37af6d1fa020f7fa532a69a0e07b32ad'
          'a1e25c7621e92598bcdb8d442133031a'
@@ -62,24 +65,27 @@ md5sums=('7399dc833388312a9efd56bdae684239'
          '00333ad5a67aa529189cb8d5efce7ec2'
          'fa5438c87ada71ae5bdf2edd84df4290'
          '27c7b30bf6c9365397b35d4cca7044f8'
+         'a4c525712f146e3be090a25b01cf3242'
          'cf9a1d524f7e5563c37413f0227fe1a1'
          '0ff3ac0767cd8fc94388ef3b301c8adc'
          '3938559de7b10ca25f86ccb59676547e'
          'ab1d907a83c8b7e359eff308ee89d9d9'
          '08f441dcf7ec24f4148d9a952738d7f4'
-         'bdcdc0250d61c33f85289e7e436546a6'
-         'ff0b346ce08dc773cdd7f96d8f640ab8'
          'b56963fa4b72c8b93e799ed25055a3b4'
          'd1eea30878b0028a5a5e36a0b0158b81'
+         'bdcdc0250d61c33f85289e7e436546a6'
+         'ab72a7b572307731ba3647e2f1e6d6fa'
          '38dc1f1869c03d4cc8e2724e6060fc65'
+         'ff0b346ce08dc773cdd7f96d8f640ab8'
          'ea71834e6c8ab194e38738b599a3e351'
          '068873d936f6592065010b056da87cc7'
          '0c1b99051ab88c9aacf108a4d7d577e2'
          '652ec7a6aa6a225f62579a315bd98421'
          '1c6a099a8b6fff65b9856eb8baab784f'
          'adf64f6092e1d05aafb1bc0c093d56b2'
+         'b0afcb5b6a3f2f05b8fd8e6d59d8e6ca'
          'b7b52cd6e554eb01aa0537bb5526e297'
-         'b0afcb5b6a3f2f05b8fd8e6d59d8e6ca')
+         'fbf0b094c7d61bbce4ab78b9d408de2e')
 
 package_pzl_common() {
 	pkgdesc="Common files for pzl games."
@@ -256,6 +262,17 @@ package_pzl_kakuro() {
 	install -m644 pzl_kakuro.desktop "$pkgdir/usr/share/applications"
 }
 
+package_pzl_knotty() {
+	pkgdesc="Logic game similar to Josh Wardle's Wordle."
+	url="http://pzl.org.uk/knotty.html"
+	depends=('pzl_common')
+	install -dm755 "$pkgdir"/usr/share/{applications,pixmaps/pzl_games,pzl_games}
+	install -m644 pzl3_download/knotty.pyw "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/knotty_data.py "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/knotty_icon.png "$pkgdir/usr/share/pixmaps/pzl_games"
+	install -m644 pzl_knotty.desktop "$pkgdir/usr/share/applications"
+}
+
 package_pzl_marupeke() {
 	pkgdesc="Puzzle where there is a potential for three symbols to be adjacent. And block them."
 	url="http://pzl.org.uk/marupeke.html"
@@ -320,6 +337,17 @@ package_pzl_scrabbler() {
 	install -m644 pzl_scrabbler.desktop "$pkgdir/usr/share/applications"
 }
 
+package_pzl_shakashaka() {
+	pkgdesc="Puzzle to place triangles into the white cells."
+	url="http://pzl.org.uk/shakashaka.html"
+	depends=('pzl_common')
+	install -dm755 "$pkgdir"/usr/share/{applications,pixmaps/pzl_games,pzl_games}
+	install -m644 pzl3_download/shakashaka.pyw "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/shakashaka_data.py "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/shakashaka_icon.png "$pkgdir/usr/share/pixmaps/pzl_games"
+	install -m644 pzl_shakashaka.desktop "$pkgdir/usr/share/applications"
+}
+
 package_pzl_skyscrapers() {
 	pkgdesc="Logic game which like Sudoku is based around Latin squares."
 	url="http://pzl.org.uk/skyscrapers.html"
@@ -448,6 +476,17 @@ package_pzl_wordladder() {
 	install -m644 pzl_wordladder.desktop "$pkgdir/usr/share/applications"
 }
 
+package_pzl_wordy() {
+	pkgdesc="Word game based on Wordle and Absurdle."
+	url="http://pzl.org.uk/wordy.html"
+	depends=('pzl_common')
+	install -dm755 "$pkgdir"/usr/share/{applications,pixmaps/pzl_games,pzl_games}
+	install -m644 pzl3_download/wordy.pyw "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/wordy_data.py "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/wordy_icon.png "$pkgdir/usr/share/pixmaps/pzl_games"
+	install -m644 pzl_wordy.desktop "$pkgdir/usr/share/applications"
+}
+
 # package_pzl_launcher() {
 # 	pkgdesc="Launcher for pzl games."
 # 	url="http://pzl.org.uk/"
diff --git a/pzl_knotty.desktop b/pzl_knotty.desktop
new file mode 100644
index 000000000000..8120d1fdc5af
--- /dev/null
+++ b/pzl_knotty.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=pzl games Knotty
+Comment=Knotty (pzl games)
+Categories=Game;LogicGame
+Exec=python /usr/share/pzl_games/knotty.pyw
+Terminal=false
+Icon=/usr/share/pixmaps/pzl_games/knotty_icon.png
+Type=Application
diff --git a/pzl_shakashaka.desktop b/pzl_shakashaka.desktop
new file mode 100644
index 000000000000..aa02f17d2fa2
--- /dev/null
+++ b/pzl_shakashaka.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=pzl games Shakashaka
+Comment=Shakashaka (pzl games)
+Categories=Game;LogicGame
+Exec=python /usr/share/pzl_games/shakashaka.pyw
+Terminal=false
+Icon=/usr/share/pixmaps/pzl_games/shakashaka_icon.png
+Type=Application
diff --git a/pzl_wordy.desktop b/pzl_wordy.desktop
new file mode 100644
index 000000000000..ed3df3b1b8e4
--- /dev/null
+++ b/pzl_wordy.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=pzl games Wordy
+Comment=Wordy (pzl games)
+Categories=Game;LogicGame
+Exec=python /usr/share/pzl_games/wordy.pyw
+Terminal=false
+Icon=/usr/share/pixmaps/pzl_games/wordy_icon.png
+Type=Application