Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] quakespasm: update to 0.96.3, remove desktop file.
@ 2024-08-30 10:24 Rutpiv
  2024-08-30 20:33 ` [PR REVIEW] " classabbyamp
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Rutpiv @ 2024-08-30 10:24 UTC (permalink / raw)
  To: ml

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

There is a new pull request by Rutpiv against master on the void-packages repository

https://github.com/Rutpiv/void-packages quakespasm
https://github.com/void-linux/void-packages/pull/52045

quakespasm: update to 0.96.3, remove desktop file.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures using specific masterdirs:
  - x86_64-musl
  - i686
- I built this PR locally for these architectures (crossbuilds):
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl
  - armv6l
  - armv6l-musl

Removing desktop file as per #49164.

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

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

From 935829cd22939dd557ec8fa1f6e7f20d288a2030 Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Fri, 30 Aug 2024 07:09:34 -0300
Subject: [PATCH] quakespasm: update to 0.96.3, remove desktop file.

---
 srcpkgs/quakespasm/files/quakespasm.desktop | 10 ----------
 srcpkgs/quakespasm/template                 | 11 ++++++++---
 2 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/quakespasm/files/quakespasm.desktop

diff --git a/srcpkgs/quakespasm/files/quakespasm.desktop b/srcpkgs/quakespasm/files/quakespasm.desktop
deleted file mode 100644
index d5b151f30d6d24..00000000000000
--- a/srcpkgs/quakespasm/files/quakespasm.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Quakespasm
-GenericName=Quake engine
-Icon=quakespasm
-Exec=quakespasm
-Categories=Game;Shooter;
-Comment=Quakespasm Quake engine
-Terminal=false
-StartupNotify=true
diff --git a/srcpkgs/quakespasm/template b/srcpkgs/quakespasm/template
index 50a0c50226f5b3..4dbce6555601da 100644
--- a/srcpkgs/quakespasm/template
+++ b/srcpkgs/quakespasm/template
@@ -1,6 +1,6 @@
 # Template file for 'quakespasm'
 pkgname=quakespasm
-version=0.96.1
+version=0.96.3
 revision=1
 build_wrksrc="Quake"
 build_style=gnu-makefile
@@ -13,14 +13,19 @@ license="GPL-2.0-or-later"
 homepage="http://quakespasm.sourceforge.net/"
 changelog="http://quakespasm.sourceforge.net/Quakespasm.html#s5"
 distfiles="${SOURCEFORGE_SITE}/quakespasm/Source/quakespasm-${version}.tar.gz"
-checksum=49a53e451d5e250982a855a8c9d2694c12397f01bd6fad0dea9e3f57f443b5cc
+checksum=b578d6ce4a4f7f4e26a24458f18c4bcc8d3854ae6252eb9982ee81d95e50180e
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) makedepends+=" MesaLib-devel"
 esac
 
+post_build() {
+	sed -e 's/Icon=net.sourceforge.quakespasm.Quakespasm/Icon=quakespasm/' \
+		../Linux/net.sourceforge.quakespasm.Quakespasm.desktop > quakespasm.desktop
+}
+
 do_install() {
 	vbin quakespasm
 	vinstall ../Misc/QuakeSpasm_512.png 644 usr/share/pixmaps quakespasm.png
-	vinstall ${FILESDIR}/quakespasm.desktop 644 usr/share/applications
+	vinstall quakespasm.desktop 644 usr/share/applications
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR REVIEW] quakespasm: update to 0.96.3, remove desktop file.
  2024-08-30 10:24 [PR PATCH] quakespasm: update to 0.96.3, remove desktop file Rutpiv
@ 2024-08-30 20:33 ` classabbyamp
  2024-08-31  2:30 ` [PR PATCH] [Updated] " Rutpiv
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2024-08-30 20:33 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52045#discussion_r1739390229

Comment:
use vsed

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] quakespasm: update to 0.96.3, remove desktop file.
  2024-08-30 10:24 [PR PATCH] quakespasm: update to 0.96.3, remove desktop file Rutpiv
  2024-08-30 20:33 ` [PR REVIEW] " classabbyamp
@ 2024-08-31  2:30 ` Rutpiv
  2024-08-31  2:35 ` [PR REVIEW] " Rutpiv
  2024-08-31  5:10 ` [PR PATCH] [Merged]: " classabbyamp
  3 siblings, 0 replies; 5+ messages in thread
From: Rutpiv @ 2024-08-31  2:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Rutpiv/void-packages quakespasm
https://github.com/void-linux/void-packages/pull/52045

quakespasm: update to 0.96.3, remove desktop file.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures using specific masterdirs:
  - x86_64-musl
  - i686
- I built this PR locally for these architectures (crossbuilds):
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl
  - armv6l
  - armv6l-musl

Removing desktop file as per #49164.

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

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

From b9ac9c6e9a1ccc576c652dc59a832417f79acaf0 Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Fri, 30 Aug 2024 07:09:34 -0300
Subject: [PATCH] quakespasm: update to 0.96.3, remove desktop file.

---
 srcpkgs/quakespasm/files/quakespasm.desktop | 10 ----------
 srcpkgs/quakespasm/template                 | 11 ++++++++---
 2 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/quakespasm/files/quakespasm.desktop

diff --git a/srcpkgs/quakespasm/files/quakespasm.desktop b/srcpkgs/quakespasm/files/quakespasm.desktop
deleted file mode 100644
index d5b151f30d6d24..00000000000000
--- a/srcpkgs/quakespasm/files/quakespasm.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Quakespasm
-GenericName=Quake engine
-Icon=quakespasm
-Exec=quakespasm
-Categories=Game;Shooter;
-Comment=Quakespasm Quake engine
-Terminal=false
-StartupNotify=true
diff --git a/srcpkgs/quakespasm/template b/srcpkgs/quakespasm/template
index 50a0c50226f5b3..9d66623761ed0d 100644
--- a/srcpkgs/quakespasm/template
+++ b/srcpkgs/quakespasm/template
@@ -1,6 +1,6 @@
 # Template file for 'quakespasm'
 pkgname=quakespasm
-version=0.96.1
+version=0.96.3
 revision=1
 build_wrksrc="Quake"
 build_style=gnu-makefile
@@ -13,14 +13,19 @@ license="GPL-2.0-or-later"
 homepage="http://quakespasm.sourceforge.net/"
 changelog="http://quakespasm.sourceforge.net/Quakespasm.html#s5"
 distfiles="${SOURCEFORGE_SITE}/quakespasm/Source/quakespasm-${version}.tar.gz"
-checksum=49a53e451d5e250982a855a8c9d2694c12397f01bd6fad0dea9e3f57f443b5cc
+checksum=b578d6ce4a4f7f4e26a24458f18c4bcc8d3854ae6252eb9982ee81d95e50180e
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) makedepends+=" MesaLib-devel"
 esac
 
+post_build() {
+	vsed -i ../Linux/net.sourceforge.quakespasm.Quakespasm.desktop \
+		-e 's/Icon=net.sourceforge.quakespasm.Quakespasm/Icon=quakespasm/'
+}
+
 do_install() {
 	vbin quakespasm
 	vinstall ../Misc/QuakeSpasm_512.png 644 usr/share/pixmaps quakespasm.png
-	vinstall ${FILESDIR}/quakespasm.desktop 644 usr/share/applications
+	vinstall ../Linux/net.sourceforge.quakespasm.Quakespasm.desktop 644 usr/share/applications
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR REVIEW] quakespasm: update to 0.96.3, remove desktop file.
  2024-08-30 10:24 [PR PATCH] quakespasm: update to 0.96.3, remove desktop file Rutpiv
  2024-08-30 20:33 ` [PR REVIEW] " classabbyamp
  2024-08-31  2:30 ` [PR PATCH] [Updated] " Rutpiv
@ 2024-08-31  2:35 ` Rutpiv
  2024-08-31  5:10 ` [PR PATCH] [Merged]: " classabbyamp
  3 siblings, 0 replies; 5+ messages in thread
From: Rutpiv @ 2024-08-31  2:35 UTC (permalink / raw)
  To: ml

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

New review comment by Rutpiv on void-packages repository

https://github.com/void-linux/void-packages/pull/52045#discussion_r1739587634

Comment:
I have updated this PR to use vsed as requested.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: quakespasm: update to 0.96.3, remove desktop file.
  2024-08-30 10:24 [PR PATCH] quakespasm: update to 0.96.3, remove desktop file Rutpiv
                   ` (2 preceding siblings ...)
  2024-08-31  2:35 ` [PR REVIEW] " Rutpiv
@ 2024-08-31  5:10 ` classabbyamp
  3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2024-08-31  5:10 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

quakespasm: update to 0.96.3, remove desktop file.
https://github.com/void-linux/void-packages/pull/52045

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures using specific masterdirs:
  - x86_64-musl
  - i686
- I built this PR locally for these architectures (crossbuilds):
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl
  - armv6l
  - armv6l-musl

Removing desktop file as per #49164.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-08-31  5:10 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-30 10:24 [PR PATCH] quakespasm: update to 0.96.3, remove desktop file Rutpiv
2024-08-30 20:33 ` [PR REVIEW] " classabbyamp
2024-08-31  2:30 ` [PR PATCH] [Updated] " Rutpiv
2024-08-31  2:35 ` [PR REVIEW] " Rutpiv
2024-08-31  5:10 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).