Re: [PR PATCH] [Updated] New package: xdemineur-2.1.1

[Clos3y <Clos3y@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 660 bytes --]

There is an updated pull request by Clos3y against master on the void-packages repository

https://github.com/Clos3y/void-packages xdemineur
https://github.com/void-linux/void-packages/pull/42927

New package: xdemineur-2.1.1
#### Testing the changes
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

A patch file from https://github.com/void-linux/void-packages/pull/42927.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xdemineur-42927.patch --]
[-- Type: text/x-diff, Size: 6744 bytes --]

From 608faf688ccd74e0f72d236d6da3ff3942b9a25c Mon Sep 17 00:00:00 2001
From: clos3y <sam.w.close@gmail.com>
Date: Wed, 22 Mar 2023 11:48:13 +0000
Subject: [PATCH 1/5] New package: xdemineur-2.1.1

---
 srcpkgs/xdemineur/files/LICENSE           | 17 ++++++++++++++++
 srcpkgs/xdemineur/files/xdemineur.desktop | 10 ++++++++++
 srcpkgs/xdemineur/template                | 24 +++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 srcpkgs/xdemineur/files/LICENSE
 create mode 100644 srcpkgs/xdemineur/files/xdemineur.desktop
 create mode 100644 srcpkgs/xdemineur/template

diff --git a/srcpkgs/xdemineur/files/LICENSE b/srcpkgs/xdemineur/files/LICENSE
new file mode 100644
index 000000000000..8da2daec3013
--- /dev/null
+++ b/srcpkgs/xdemineur/files/LICENSE
@@ -0,0 +1,17 @@
+Copyright
+---------
+
+Copyright © 1993-1999 Marc Baudoin <babafou@babafou.eu.org>
+
+Permission to use, copy, modify, and distribute this software and
+its documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notice appear in all
+copies and that both that copyright notice and this permission
+notice appear in supporting documentation.  The author makes no
+representations about the suitability of this software for any
+purpose.  It is provided "as is" without express or implied
+warranty.
+
+-- 
+Marc Baudoin
+<babafou@babafou.eu.org>
diff --git a/srcpkgs/xdemineur/files/xdemineur.desktop b/srcpkgs/xdemineur/files/xdemineur.desktop
new file mode 100644
index 000000000000..2f7f07ca749b
--- /dev/null
+++ b/srcpkgs/xdemineur/files/xdemineur.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=xdemineur
+GenericName=xdemineur
+Comment=A minesweeper game for the X Window System
+Exec=xdemineur
+Terminal=false
+Categories=Game;Application;
+
diff --git a/srcpkgs/xdemineur/template b/srcpkgs/xdemineur/template
new file mode 100644
index 000000000000..f2aa78c3ca54
--- /dev/null
+++ b/srcpkgs/xdemineur/template
@@ -0,0 +1,24 @@
+# Template file for 'xdemineur'
+pkgname=xdemineur
+version=2.1.1
+revision=1
+archs="x86_64"
+build_style=gnu-makefile
+makedepends="imake libX11-devel libXpm-devel libXext-devel"
+short_desc="Minesweeper game for the X Window System"
+maintainer="clos3y <sam.w.close@gmail.com>"
+license="custom:MIT-like"
+homepage="http://www.babafou.eu.org/xdemineur"
+distfiles="http://www.babafou.eu.org/xdemineur/xdemineur-${version}.tar.gz"
+checksum=593824412a208a1b75d5b15745a271dc3eba330d41f7718f4826567d04bcbb9b
+
+do_build() {
+	xmkmf
+}
+
+post_install() {
+	vinstall ${FILESDIR}/xdemineur.desktop 644 usr/share/applications
+	mv xdemineur.man xdemineur.6
+	vman xdemineur.6
+	vlicense ${FILESDIR}/LICENSE
+}

From 2a3d42f6a292005ca380cad5109d7482b4fb2981 Mon Sep 17 00:00:00 2001
From: clos3y <sam.w.close@gmail.com>
Date: Wed, 22 Mar 2023 21:54:35 +0000
Subject: [PATCH 2/5] xdemineur: removed arch, removed imake, altered do_build,
 changed post_install to do_install

---
 srcpkgs/xdemineur/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xdemineur/template b/srcpkgs/xdemineur/template
index f2aa78c3ca54..49ebd02d216b 100644
--- a/srcpkgs/xdemineur/template
+++ b/srcpkgs/xdemineur/template
@@ -1,10 +1,9 @@
 # Template file for 'xdemineur'
 pkgname=xdemineur
 version=2.1.1
-revision=1
-archs="x86_64"
+revision=2
 build_style=gnu-makefile
-makedepends="imake libX11-devel libXpm-devel libXext-devel"
+makedepends="libX11-devel libXpm-devel libXext-devel"
 short_desc="Minesweeper game for the X Window System"
 maintainer="clos3y <sam.w.close@gmail.com>"
 license="custom:MIT-like"
@@ -13,12 +12,13 @@ distfiles="http://www.babafou.eu.org/xdemineur/xdemineur-${version}.tar.gz"
 checksum=593824412a208a1b75d5b15745a271dc3eba330d41f7718f4826567d04bcbb9b
 
 do_build() {
-	xmkmf
+	"$CC" -lXpm -lX11 demineur.c main.c util.c xdemineur.c -o xdemineur
 }
 
-post_install() {
+do_install() {
+	vbin xdemineur
 	vinstall ${FILESDIR}/xdemineur.desktop 644 usr/share/applications
 	mv xdemineur.man xdemineur.6
 	vman xdemineur.6
-	vlicense ${FILESDIR}/LICENSE
+	vlicense <( sed -n '/Copyright/,/*/p' INSTALL ) 
 }

From 0f8bf24ccad0dae7bf1a83e80856cbbcc6e08bba Mon Sep 17 00:00:00 2001
From: clos3y <sam.w.close@gmail.com>
Date: Wed, 22 Mar 2023 21:55:12 +0000
Subject: [PATCH 3/5] xdemineur: removed LICENSE from FILESDIR

---
 srcpkgs/xdemineur/files/LICENSE | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/xdemineur/files/LICENSE

diff --git a/srcpkgs/xdemineur/files/LICENSE b/srcpkgs/xdemineur/files/LICENSE
deleted file mode 100644
index 8da2daec3013..000000000000
--- a/srcpkgs/xdemineur/files/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright
----------
-
-Copyright © 1993-1999 Marc Baudoin <babafou@babafou.eu.org>
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that copyright notice and this permission
-notice appear in supporting documentation.  The author makes no
-representations about the suitability of this software for any
-purpose.  It is provided "as is" without express or implied
-warranty.
-
--- 
-Marc Baudoin
-<babafou@babafou.eu.org>

From d0f2486f3b18449d0babf938319da772e7189aa6 Mon Sep 17 00:00:00 2001
From: clos3y <sam.w.close@gmail.com>
Date: Wed, 22 Mar 2023 21:58:21 +0000
Subject: [PATCH 4/5] xdemineur: fixed lint error

---
 srcpkgs/xdemineur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xdemineur/template b/srcpkgs/xdemineur/template
index 49ebd02d216b..1a25c67058c0 100644
--- a/srcpkgs/xdemineur/template
+++ b/srcpkgs/xdemineur/template
@@ -20,5 +20,5 @@ do_install() {
 	vinstall ${FILESDIR}/xdemineur.desktop 644 usr/share/applications
 	mv xdemineur.man xdemineur.6
 	vman xdemineur.6
-	vlicense <( sed -n '/Copyright/,/*/p' INSTALL ) 
+	vlicense <( sed -n '/Copyright/,/*/p' INSTALL )
 }

From b49b32c3d16f063d89c607ecf57031b6f1825f94 Mon Sep 17 00:00:00 2001
From: clos3y <sam.w.close@gmail.com>
Date: Wed, 22 Mar 2023 21:59:08 +0000
Subject: [PATCH 5/5] xdemineur: reverted revision

---
 srcpkgs/xdemineur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xdemineur/template b/srcpkgs/xdemineur/template
index 1a25c67058c0..e54899755aec 100644
--- a/srcpkgs/xdemineur/template
+++ b/srcpkgs/xdemineur/template
@@ -1,7 +1,7 @@
 # Template file for 'xdemineur'
 pkgname=xdemineur
 version=2.1.1
-revision=2
+revision=1
 build_style=gnu-makefile
 makedepends="libX11-devel libXpm-devel libXext-devel"
 short_desc="Minesweeper game for the X Window System"