* [PR PATCH] boswars: move binary out of /usr/share.
@ 2020-09-04 11:23 fosslinux
2020-09-04 11:40 ` [PR PATCH] [Updated] " fosslinux
2020-09-04 23:12 ` fosslinux
0 siblings, 2 replies; 3+ messages in thread
From: fosslinux @ 2020-09-04 11:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
There is a new pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages boswars-fix
https://github.com/void-linux/void-packages/pull/24658
boswars: move binary out of /usr/share.
Fixes lint error. Has been tested.
Required for noarch rebuild.
A patch file from https://github.com/void-linux/void-packages/pull/24658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boswars-fix-24658.patch --]
[-- Type: text/x-diff, Size: 2118 bytes --]
From beea9f03ab286cf91421b54d76b2c68362a21538 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 4 Sep 2020 21:20:52 +1000
Subject: [PATCH] boswars: move binary out of /usr/share.
---
srcpkgs/boswars/files/boswars | 2 +-
srcpkgs/boswars/template | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/boswars/files/boswars b/srcpkgs/boswars/files/boswars
index 19d73751c7a..aebbf50ba40 100644
--- a/srcpkgs/boswars/files/boswars
+++ b/srcpkgs/boswars/files/boswars
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/share/boswars/boswars -d /usr/share/boswars ${1+"$@"}
+exec /usr/libexec/boswars/boswars -d /usr/share/boswars ${1+"$@"}
diff --git a/srcpkgs/boswars/template b/srcpkgs/boswars/template
index 4587f93cfd0..f27e6007dec 100644
--- a/srcpkgs/boswars/template
+++ b/srcpkgs/boswars/template
@@ -1,7 +1,7 @@
# Template file for 'boswars'
pkgname=boswars
version=2.7
-revision=5
+revision=6
wrksrc="${pkgname}-${version}-src"
hostmakedepends="pkg-config libpng-progs python"
makedepends="SDL-devel glu-devel libpng-devel libtheora-devel libvorbis-devel lua51-devel"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://boswars.org"
distfiles="${homepage}/dist/releases/boswars-${version}-src.tar.gz"
checksum=dc3718f531e9ea413cf37e1333b62a4c5e69f1405502d9c59b9e424635135e3e
-broken="fails lint (ELF in /usr/share)"
+python_version=2
post_extract() {
#png bugfix for version 2.7, https://savannah.nongnu.org/bugs/?39610
@@ -37,8 +37,10 @@ do_build() {
}
do_install() {
+ vmkdir usr/libexec/boswars
+ vcopy fbuild/release/boswars usr/libexec/boswars/
+
vmkdir usr/share/boswars
- vcopy fbuild/release/boswars usr/share/boswars/
vcopy campaigns usr/share/boswars/
vcopy doc usr/share/boswars/
vcopy graphics usr/share/boswars/
@@ -49,7 +51,9 @@ do_install() {
vcopy scripts usr/share/boswars/
vcopy sounds usr/share/boswars/
vcopy units usr/share/boswars/
+
vbin ${FILESDIR}/boswars
+
vinstall ${FILESDIR}/boswars.desktop 644 usr/share/applications/
vinstall ${FILESDIR}/boswars.png 644 usr/share/pixmaps/
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] boswars: move binary out of /usr/share.
2020-09-04 11:23 [PR PATCH] boswars: move binary out of /usr/share fosslinux
@ 2020-09-04 11:40 ` fosslinux
2020-09-04 23:12 ` fosslinux
1 sibling, 0 replies; 3+ messages in thread
From: fosslinux @ 2020-09-04 11:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
There is an updated pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages boswars-fix
https://github.com/void-linux/void-packages/pull/24658
boswars: move binary out of /usr/share.
Fixes lint error. Has been tested.
Required for noarch rebuild.
A patch file from https://github.com/void-linux/void-packages/pull/24658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boswars-fix-24658.patch --]
[-- Type: text/x-diff, Size: 2291 bytes --]
From 521039e7827629aa8cb2b466b8b436990b156796 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 4 Sep 2020 21:20:52 +1000
Subject: [PATCH] boswars: move binary out of /usr/share.
---
srcpkgs/boswars/files/boswars | 2 +-
srcpkgs/boswars/template | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/boswars/files/boswars b/srcpkgs/boswars/files/boswars
index 19d73751c7a..aebbf50ba40 100644
--- a/srcpkgs/boswars/files/boswars
+++ b/srcpkgs/boswars/files/boswars
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/share/boswars/boswars -d /usr/share/boswars ${1+"$@"}
+exec /usr/libexec/boswars/boswars -d /usr/share/boswars ${1+"$@"}
diff --git a/srcpkgs/boswars/template b/srcpkgs/boswars/template
index 4587f93cfd0..37ac3d7104e 100644
--- a/srcpkgs/boswars/template
+++ b/srcpkgs/boswars/template
@@ -1,18 +1,18 @@
# Template file for 'boswars'
pkgname=boswars
version=2.7
-revision=5
+revision=6
wrksrc="${pkgname}-${version}-src"
hostmakedepends="pkg-config libpng-progs python"
makedepends="SDL-devel glu-devel libpng-devel libtheora-devel libvorbis-devel lua51-devel"
depends="${pkgname}-data"
-short_desc="A futuristic real-time strategy game (RTS)"
+short_desc="Futuristic real-time strategy game (RTS)"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-or-later"
homepage="http://boswars.org"
distfiles="${homepage}/dist/releases/boswars-${version}-src.tar.gz"
checksum=dc3718f531e9ea413cf37e1333b62a4c5e69f1405502d9c59b9e424635135e3e
-broken="fails lint (ELF in /usr/share)"
+python_version=2
post_extract() {
#png bugfix for version 2.7, https://savannah.nongnu.org/bugs/?39610
@@ -37,8 +37,10 @@ do_build() {
}
do_install() {
+ vmkdir usr/libexec/boswars
+ vcopy fbuild/release/boswars usr/libexec/boswars/
+
vmkdir usr/share/boswars
- vcopy fbuild/release/boswars usr/share/boswars/
vcopy campaigns usr/share/boswars/
vcopy doc usr/share/boswars/
vcopy graphics usr/share/boswars/
@@ -49,7 +51,9 @@ do_install() {
vcopy scripts usr/share/boswars/
vcopy sounds usr/share/boswars/
vcopy units usr/share/boswars/
+
vbin ${FILESDIR}/boswars
+
vinstall ${FILESDIR}/boswars.desktop 644 usr/share/applications/
vinstall ${FILESDIR}/boswars.png 644 usr/share/pixmaps/
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] boswars: move binary out of /usr/share.
2020-09-04 11:23 [PR PATCH] boswars: move binary out of /usr/share fosslinux
2020-09-04 11:40 ` [PR PATCH] [Updated] " fosslinux
@ 2020-09-04 23:12 ` fosslinux
1 sibling, 0 replies; 3+ messages in thread
From: fosslinux @ 2020-09-04 23:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
There is an updated pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages boswars-fix
https://github.com/void-linux/void-packages/pull/24658
boswars: move binary out of /usr/share.
Fixes lint error. Has been tested.
Required for noarch rebuild.
A patch file from https://github.com/void-linux/void-packages/pull/24658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boswars-fix-24658.patch --]
[-- Type: text/x-diff, Size: 2468 bytes --]
From 7509c02303fdf226f00b2f511f3c175239692b00 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 4 Sep 2020 21:20:52 +1000
Subject: [PATCH] boswars: move binary out of /usr/share, remove noarch.
---
srcpkgs/boswars/files/boswars | 2 +-
srcpkgs/boswars/template | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/boswars/files/boswars b/srcpkgs/boswars/files/boswars
index 19d73751c7a..aebbf50ba40 100644
--- a/srcpkgs/boswars/files/boswars
+++ b/srcpkgs/boswars/files/boswars
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/share/boswars/boswars -d /usr/share/boswars ${1+"$@"}
+exec /usr/libexec/boswars/boswars -d /usr/share/boswars ${1+"$@"}
diff --git a/srcpkgs/boswars/template b/srcpkgs/boswars/template
index 4587f93cfd0..db713cd559a 100644
--- a/srcpkgs/boswars/template
+++ b/srcpkgs/boswars/template
@@ -1,18 +1,18 @@
# Template file for 'boswars'
pkgname=boswars
version=2.7
-revision=5
+revision=6
wrksrc="${pkgname}-${version}-src"
hostmakedepends="pkg-config libpng-progs python"
makedepends="SDL-devel glu-devel libpng-devel libtheora-devel libvorbis-devel lua51-devel"
depends="${pkgname}-data"
-short_desc="A futuristic real-time strategy game (RTS)"
+short_desc="Futuristic real-time strategy game (RTS)"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-or-later"
homepage="http://boswars.org"
distfiles="${homepage}/dist/releases/boswars-${version}-src.tar.gz"
checksum=dc3718f531e9ea413cf37e1333b62a4c5e69f1405502d9c59b9e424635135e3e
-broken="fails lint (ELF in /usr/share)"
+python_version=2
post_extract() {
#png bugfix for version 2.7, https://savannah.nongnu.org/bugs/?39610
@@ -37,8 +37,10 @@ do_build() {
}
do_install() {
+ vmkdir usr/libexec/boswars
+ vcopy fbuild/release/boswars usr/libexec/boswars/
+
vmkdir usr/share/boswars
- vcopy fbuild/release/boswars usr/share/boswars/
vcopy campaigns usr/share/boswars/
vcopy doc usr/share/boswars/
vcopy graphics usr/share/boswars/
@@ -49,14 +51,15 @@ do_install() {
vcopy scripts usr/share/boswars/
vcopy sounds usr/share/boswars/
vcopy units usr/share/boswars/
+
vbin ${FILESDIR}/boswars
+
vinstall ${FILESDIR}/boswars.desktop 644 usr/share/applications/
vinstall ${FILESDIR}/boswars.png 644 usr/share/pixmaps/
}
boswars-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/boswars/campaigns
vmove usr/share/boswars/doc
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-04 23:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-04 11:23 [PR PATCH] boswars: move binary out of /usr/share fosslinux
2020-09-04 11:40 ` [PR PATCH] [Updated] " fosslinux
2020-09-04 23:12 ` fosslinux
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).