CVS commit: pkgsrc/games/xye

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Feb  9 08:45:40 UTC 2025

Modified Files:
        pkgsrc/games/xye: Makefile PLIST distinfo
        pkgsrc/games/xye/patches: patch-aa patch-src_gen.cpp
Added Files:
        pkgsrc/games/xye/patches: patch-src_xye.cpp patch-src_xye.h
            patch-src_xye__script.cpp

Log Message:
xye: Update to 0.12.2

upstream changes:
-----------------
0.12.2 (SVN r404)
  - Create pixmaps folder.
  - Will install icon to installpath/share/pixmaps
  - Will install launcher to installpath/share/applications
  - Other minor modifications to build scripts.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/xye/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/xye/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/xye/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/xye/patches/patch-aa \
    pkgsrc/games/xye/patches/patch-src_gen.cpp
cvs rdiff -u -r0 -r1.1 pkgsrc/games/xye/patches/patch-src_xye.cpp \
    pkgsrc/games/xye/patches/patch-src_xye.h \
    pkgsrc/games/xye/patches/patch-src_xye__script.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/xye/Makefile
diff -u pkgsrc/games/xye/Makefile:1.22 pkgsrc/games/xye/Makefile:1.23
--- pkgsrc/games/xye/Makefile:1.22      Mon Jan  6 21:49:19 2025
+++ pkgsrc/games/xye/Makefile   Sun Feb  9 08:45:39 2025
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.22 2025/01/06 21:49:19 ktnb Exp $
+# $NetBSD: Makefile,v 1.23 2025/02/09 08:45:39 triaxx Exp $
 #
 
-DISTNAME=      xye-0.12.1
-PKGREVISION=   4
+DISTNAME=      xye-0.12.2
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xye/0.12.1/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://xye.sourceforge.net/
 COMMENT=       Kye clone
+LICENSE=       zlib AND xye-resource
 
 GNU_CONFIGURE=         yes
 #CONFIGURE_ARGS+=      --with-docdir=${PREFIX}/share/doc

Index: pkgsrc/games/xye/PLIST
diff -u pkgsrc/games/xye/PLIST:1.4 pkgsrc/games/xye/PLIST:1.5
--- pkgsrc/games/xye/PLIST:1.4  Sun Jun  9 06:30:14 2013
+++ pkgsrc/games/xye/PLIST      Sun Feb  9 08:45:39 2025
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2013/06/09 06:30:14 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/02/09 08:45:39 triaxx Exp $
 bin/xye
+share/applications/xye.desktop
+share/pixmaps/xye.png
 share/xye/AUTHORS
 share/xye/ChangeLog
 share/xye/NEWS
@@ -39,4 +41,3 @@ share/xye/res/fon.bmp
 share/xye/res/fon_bold.bmp
 share/xye/res/xye.png
 share/xye/res/xye_luminosity.png
-share/xye/xye.svg

Index: pkgsrc/games/xye/distinfo
diff -u pkgsrc/games/xye/distinfo:1.9 pkgsrc/games/xye/distinfo:1.10
--- pkgsrc/games/xye/distinfo:1.9       Tue Oct 26 10:44:36 2021
+++ pkgsrc/games/xye/distinfo   Sun Feb  9 08:45:39 2025
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:44:36 nia Exp $
+$NetBSD: distinfo,v 1.10 2025/02/09 08:45:39 triaxx Exp $
 
-BLAKE2s (xye-0.12.1.tar.gz) = b8e34217caed328cf877e3d98175d540ae3fb4602aebfe3bc99ea22a9e17cf94
-SHA512 (xye-0.12.1.tar.gz) = aadafdb7b8e0546435838279c2929803be8dde00f3f3c08668c35d0a8ccf5bad511e65629e3f7261140edcf0980d19fda2be1401593ac4c0410beede542e857b
-Size (xye-0.12.1.tar.gz) = 2850776 bytes
-SHA1 (patch-aa) = 141a40923c4de3ea7df7975f1b4bd2303fde2ea5
-SHA1 (patch-src_editorsave.cpp) = 40be6484c31c2960bcabe690520f4af2253e3231
-SHA1 (patch-src_gen.cpp) = 51ea8d4fd96c7846f195e4e942cfc3f69041a5b3
+BLAKE2s (xye-0.12.2.tar.gz) = bdaf8f56a1d251bbc4015597a48811f5bfc121f34b491e1a84587636e158b9b0
+SHA512 (xye-0.12.2.tar.gz) = a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa
+Size (xye-0.12.2.tar.gz) = 2860290 bytes
+SHA1 (patch-aa) = aabb3207c55c05a8bbd4c787ef4bc32e1c5f247e
+SHA1 (patch-src_gen.cpp) = 251b64dd33eb2dfba1a4b769fd56e96e4d666215
+SHA1 (patch-src_xye.cpp) = e7bf79e4bafc1303302b55d7088150a223c41acc
+SHA1 (patch-src_xye.h) = 7b096ab8ecd653076e1774fcacffa3b7d02bfa9b
+SHA1 (patch-src_xye__script.cpp) = 0aad4013f42f83727fb180f8e242dba65ce1ada5

Index: pkgsrc/games/xye/patches/patch-aa
diff -u pkgsrc/games/xye/patches/patch-aa:1.3 pkgsrc/games/xye/patches/patch-aa:1.4
--- pkgsrc/games/xye/patches/patch-aa:1.3       Sun Jun  9 06:30:14 2013
+++ pkgsrc/games/xye/patches/patch-aa   Sun Feb  9 08:45:39 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2013/06/09 06:30:14 ryoon Exp $
+$NetBSD: patch-aa,v 1.4 2025/02/09 08:45:39 triaxx Exp $
+
+Add missing header files.
 
 --- src/options.cpp.orig       2013-06-09 06:21:13.000000000 +0000
 +++ src/options.cpp
Index: pkgsrc/games/xye/patches/patch-src_gen.cpp
diff -u pkgsrc/games/xye/patches/patch-src_gen.cpp:1.3 pkgsrc/games/xye/patches/patch-src_gen.cpp:1.4
--- pkgsrc/games/xye/patches/patch-src_gen.cpp:1.3      Thu Jun 13 21:42:22 2013
+++ pkgsrc/games/xye/patches/patch-src_gen.cpp  Sun Feb  9 08:45:39 2025
@@ -1,13 +1,14 @@
-$NetBSD: patch-src_gen.cpp,v 1.3 2013/06/13 21:42:22 joerg Exp $
+$NetBSD: patch-src_gen.cpp,v 1.4 2025/02/09 08:45:39 triaxx Exp $
 
---- src/gen.cpp.orig   2013-06-13 19:51:44.000000000 +0000
+Add missing header files.
+
+--- src/gen.cpp.orig   2025-02-09 07:32:23.472515921 +0000
 +++ src/gen.cpp
-@@ -21,6 +21,8 @@ Permission is granted to anyone to use t
+@@ -21,6 +21,7 @@ Permission is granted to anyone to use t
  #include<cstdio>
  #include<iostream>
  #include<fstream>
 +#include<ctime>
-+#include <unistd.h>
+ #include <unistd.h>
  
  const float F_RAND_MAX = (float)(RAND_MAX);
- 

Added files:

Index: pkgsrc/games/xye/patches/patch-src_xye.cpp
diff -u /dev/null pkgsrc/games/xye/patches/patch-src_xye.cpp:1.1
--- /dev/null   Sun Feb  9 08:45:40 2025
+++ pkgsrc/games/xye/patches/patch-src_xye.cpp  Sun Feb  9 08:45:39 2025
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_xye.cpp,v 1.1 2025/02/09 08:45:39 triaxx Exp $
+
+Avoid ambiguity with std::lock.
+
+--- src/xye.cpp.orig   2025-02-09 07:33:16.280947404 +0000
++++ src/xye.cpp
+@@ -7806,20 +7806,20 @@ bool key::GetXyesKeys(unsigned int &yl,u
+ 
+ /**Start Class Lock**/
+ 
+-lock::lock(square* sq, blockcolor color)
++xye_lock::xye_lock(square* sq, blockcolor color)
+ {
+     type=OT_LOCK;
+     c=color;
+     ObjectConstruct(sq);
+ }
+-void lock::Draw(unsigned int x, unsigned int y)
++void xye_lock::Draw(unsigned int x, unsigned int y)
+ {
+     Drawer D(game::sprites,sz*7,sz*4,sz,sz);
+     D.SetColors(options::BKColor[c],255);
+     D.Draw(game::screen,x,y);
+ }
+ 
+-bool lock::trypush(edir dir,obj* pusher)
++bool xye_lock::trypush(edir dir,obj* pusher)
+ {
+     if ((pusher->GetType()==OT_XYE) && (key::GotKey(c)))
+     {
+@@ -7831,9 +7831,9 @@ bool lock::trypush(edir dir,obj* pusher)
+     return false;
+ }
+ 
+-bool lock::HasRoundCorner(roundcorner rnc) { return false; }
++bool xye_lock::HasRoundCorner(roundcorner rnc) { return false; }
+ 
+-inline bool lock::HasBlockColor(blockcolor bc) { return false; }
++inline bool xye_lock::HasBlockColor(blockcolor bc) { return false; }
+ 
+ 
+ /**End Class Lock**/
Index: pkgsrc/games/xye/patches/patch-src_xye.h
diff -u /dev/null pkgsrc/games/xye/patches/patch-src_xye.h:1.1
--- /dev/null   Sun Feb  9 08:45:40 2025
+++ pkgsrc/games/xye/patches/patch-src_xye.h    Sun Feb  9 08:45:39 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_xye.h,v 1.1 2025/02/09 08:45:39 triaxx Exp $
+
+Avoid ambiguity with std::lock.
+
+--- src/xye.h.orig     2025-02-09 07:32:37.379337445 +0000
++++ src/xye.h
+@@ -1045,14 +1045,14 @@ class key : public obj
+ };
+ 
+ /** lock **/
+-class lock : public obj
++class xye_lock : public obj
+ {
+  private:
+ 
+      void OnDeath() {}
+ 
+  public:
+-     lock(square* sq,blockcolor color);
++     xye_lock(square* sq,blockcolor color);
+      blockcolor c;
+      void Draw(unsigned int x, unsigned int y);
+      bool trypush(edir dir,obj* pusher);
Index: pkgsrc/games/xye/patches/patch-src_xye__script.cpp
diff -u /dev/null pkgsrc/games/xye/patches/patch-src_xye__script.cpp:1.1
--- /dev/null   Sun Feb  9 08:45:40 2025
+++ pkgsrc/games/xye/patches/patch-src_xye__script.cpp  Sun Feb  9 08:45:39 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_xye__script.cpp,v 1.1 2025/02/09 08:45:39 triaxx Exp $
+
+Avoid ambiguity with std::lock.
+
+--- src/xye_script.cpp.orig    2025-02-09 07:35:18.118738041 +0000
++++ src/xye_script.cpp
+@@ -859,7 +859,7 @@ void Load_Lock(TiXmlElement* el)
+         el->QueryIntAttribute("x",&LastX);
+         el->QueryIntAttribute("y",&LastY);
+         blockcolor c=GetElementBlockColor(el);
+-    lock* bc=new lock(game::SquareN(LastX,LastY),c);
++        xye_lock* bc=new xye_lock(game::SquareN(LastX,LastY),c);
+ }
+ 
+ /* Load Key*/