Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] mog: unbreak, replace mog-data
@ 2021-07-21 20:01 Chocimier
  2021-07-22 20:20 ` [PR PATCH] [Merged]: " Chocimier
  0 siblings, 1 reply; 2+ messages in thread
From: Chocimier @ 2021-07-21 20:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Chocimier/void-packages-org mog
https://github.com/void-linux/void-packages/pull/32107

mog: unbreak, replace mog-data
new tarball is uncompressed old tarball, verified
with copy hosted by slackware

#### Have the results of the proposed changes been tested?
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From c3b00b04924d2656fa6fc64ba5e09104874c5cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 21 Jul 2021 21:58:49 +0200
Subject: [PATCH] mog: unbreak, replace mog-data

new tarball is uncompressed old tarball, verified
with copy hosted by slackware
---
 srcpkgs/mog-data     |  1 -
 srcpkgs/mog/template | 20 +++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/mog-data

diff --git a/srcpkgs/mog-data b/srcpkgs/mog-data
deleted file mode 120000
index 678fd02590df..000000000000
--- a/srcpkgs/mog-data
+++ /dev/null
@@ -1 +0,0 @@
-mog
\ No newline at end of file
diff --git a/srcpkgs/mog/template b/srcpkgs/mog/template
index 88421ccef317..514666e99d1e 100644
--- a/srcpkgs/mog/template
+++ b/srcpkgs/mog/template
@@ -6,14 +6,13 @@ _build=1548
 wrksrc=${pkgname}-${version}.${_build}
 build_style=gnu-makefile
 makedepends="SDL_image-devel SDL_mixer-devel SDL_sound-devel"
-depends="mog-data>=${version}_${revision}"
 short_desc="Remake of classic MSX game The Maze of Galious"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.braingames.getput.com/mog/"
-distfiles="http://urchlay.naptime.net/~urchlay/src/mog.src_${version}-${_build}.tgz"
-checksum=707bbc1b167a55989916f803dbe55c288652fb54df6194be029c41be99e9ec3a
-broken="ELF in /usr/share"
+homepage="https://mog.jorito.net/"
+distfiles="https://braingames.jorito.net/mog/downloads/mog.src_${version}-${_build}.tgz"
+checksum=3caf30d86f5b010b9266ef860c8c8ce0be23f37dee93dd037e7927d4237475eb
+replaces="mog-data>=0"
 
 CFLAGS="-g3 -O3 -Wno-write-strings -I${XBPS_CROSS_BASE}/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT"
 
@@ -24,14 +23,5 @@ pre_build() {
 	libs+=" -lSDL_mixer"
 	libs+=" -lSDL_sound"
 	libs+=" -lSDL -lpthread"
-	sed -i build/linux/Makefile -e "s;@LIBS@;${libs};"
-}
-
-mog-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/mog/graphics
-		vmove usr/share/mog/sound
-		vmove usr/share/mog/rooms
-	}
+	vsed -i build/linux/Makefile -e "s;@LIBS@;${libs};" -e s:/share/:/libexec/:
 }

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

* Re: [PR PATCH] [Merged]: mog: unbreak, replace mog-data
  2021-07-21 20:01 [PR PATCH] mog: unbreak, replace mog-data Chocimier
@ 2021-07-22 20:20 ` Chocimier
  0 siblings, 0 replies; 2+ messages in thread
From: Chocimier @ 2021-07-22 20:20 UTC (permalink / raw)
  To: ml

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

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

mog: unbreak, replace mog-data
https://github.com/void-linux/void-packages/pull/32107

Description:
new tarball is uncompressed old tarball, verified
with copy hosted by slackware

#### Have the results of the proposed changes been tested?
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

end of thread, other threads:[~2021-07-22 20:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-21 20:01 [PR PATCH] mog: unbreak, replace mog-data Chocimier
2021-07-22 20:20 ` [PR PATCH] [Merged]: " Chocimier

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).