Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] opensurge: update to 0.5.2.
@ 2021-01-27 17:31 abenson
  2021-01-27 18:04 ` [PR PATCH] [Updated] " abenson
  2021-01-27 18:11 ` [PR PATCH] [Merged]: " abenson
  0 siblings, 2 replies; 3+ messages in thread
From: abenson @ 2021-01-27 17:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages opensurge_0.5.2
https://github.com/void-linux/void-packages/pull/28265

opensurge: update to 0.5.2.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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.)
- [X] I built this PR locally for my native architecture, (x86_64)
- [ ] 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/28265.patch is attached

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

From ddc8c8b6646b99789f8e389920d0d74a8b4dc77b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:07:54 -0600
Subject: [PATCH] opensurge: update to 0.5.2.

---
 srcpkgs/opensurge/patches/fix-installdir.patch | 11 -----------
 srcpkgs/opensurge/patches/fix_ssize_t.patch    | 18 ------------------
 srcpkgs/opensurge/template                     | 10 +++++++---
 3 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/opensurge/patches/fix-installdir.patch
 delete mode 100644 srcpkgs/opensurge/patches/fix_ssize_t.patch

diff --git a/srcpkgs/opensurge/patches/fix-installdir.patch b/srcpkgs/opensurge/patches/fix-installdir.patch
deleted file mode 100644
index e1bdf99d0a5..00000000000
--- a/srcpkgs/opensurge/patches/fix-installdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -651,7 +651,7 @@
- # Installing on *nix
- IF(UNIX)
-   INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure that you have the appropriate privileges.\")")
--  INSTALL(TARGETS "${GAME_UNIXNAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
-+  INSTALL(TARGETS "${GAME_UNIXNAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-   INSTALL(FILES LICENSE README.md CHANGES.md logo.png surge.png surge.rocks DESTINATION "${GAME_DATADIR}")
-   INSTALL(DIRECTORY characters scripts sprites config images levels musics quests samples scripts themes languages fonts licenses DESTINATION "${GAME_DATADIR}" PATTERN ".git" EXCLUDE)
-   IF(DESKTOP_INSTALL)
diff --git a/srcpkgs/opensurge/patches/fix_ssize_t.patch b/srcpkgs/opensurge/patches/fix_ssize_t.patch
deleted file mode 100644
index b586a48ef4a..00000000000
--- a/srcpkgs/opensurge/patches/fix_ssize_t.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/core/zip/zip.h.orig
-+++ src/core/zip/zip.h
-@@ -19,15 +19,6 @@
- extern "C" {
- #endif
- 
--#if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \
--    !defined(_SSIZE_T) && !defined(_SSIZE_T_) && \
--    !defined(__ssize_t_defined) && !defined(ssize_t) && \
--    !defined(_SSIZE_T_DECLARED) && !defined(HAVE_SSIZE_T)
--#define _SSIZE_T
--#define __ssize_t_defined
--typedef long  ssize_t;  /* byte count or error */
--#endif
--
- #ifndef MAX_PATH
- #define MAX_PATH 32767 /* # chars in a path name including NULL */
- #endif
diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index 5fb036d9253..1e8d42c4fa8 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -1,7 +1,7 @@
 # Template file for 'opensurge'
 pkgname=opensurge
-version=0.5.1.2
-revision=4
+version=0.5.2
+revision=1
 build_style=cmake
 hostmakedepends="surgescript pkg-config"
 makedepends="allegro5-devel surgescript surgescript-devel"
@@ -10,5 +10,9 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://opensurge2d.org/"
 distfiles="https://github.com/alemart/opensurge/archive/v${version}.tar.gz"
-checksum=d060e3215231741ce0b4e5b897af52f8755c57660c8a33856bf921c83af18ba2
+checksum=838b8ba506e45c800091d8ba7bb830d024907934fba35bf369d92fe13feaa3de
 replaces="opensurge-data>=0"
+
+pre_configure() {
+	vsed -i CMakeLists.txt -e 's/GAME_BINDIR "games"/GAME_BINDIR "bin"/'
+}

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

* Re: [PR PATCH] [Updated] opensurge: update to 0.5.2.
  2021-01-27 17:31 [PR PATCH] opensurge: update to 0.5.2 abenson
@ 2021-01-27 18:04 ` abenson
  2021-01-27 18:11 ` [PR PATCH] [Merged]: " abenson
  1 sibling, 0 replies; 3+ messages in thread
From: abenson @ 2021-01-27 18:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages opensurge_0.5.2
https://github.com/void-linux/void-packages/pull/28265

opensurge: update to 0.5.2.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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.)
- [X] I built this PR locally for my native architecture, (x86_64)
- [ ] 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/28265.patch is attached

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

From afd9280def0309a409659f637fe4190bdddd101d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:07:54 -0600
Subject: [PATCH] opensurge: update to 0.5.2.

---
 srcpkgs/opensurge/patches/fix-installdir.patch        | 11 -----------
 .../patches/{fix_ssize_t.patch => fix-ssize.patch}    |  0
 srcpkgs/opensurge/template                            | 10 +++++++---
 3 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/opensurge/patches/fix-installdir.patch
 rename srcpkgs/opensurge/patches/{fix_ssize_t.patch => fix-ssize.patch} (100%)

diff --git a/srcpkgs/opensurge/patches/fix-installdir.patch b/srcpkgs/opensurge/patches/fix-installdir.patch
deleted file mode 100644
index e1bdf99d0a5..00000000000
--- a/srcpkgs/opensurge/patches/fix-installdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -651,7 +651,7 @@
- # Installing on *nix
- IF(UNIX)
-   INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure that you have the appropriate privileges.\")")
--  INSTALL(TARGETS "${GAME_UNIXNAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
-+  INSTALL(TARGETS "${GAME_UNIXNAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-   INSTALL(FILES LICENSE README.md CHANGES.md logo.png surge.png surge.rocks DESTINATION "${GAME_DATADIR}")
-   INSTALL(DIRECTORY characters scripts sprites config images levels musics quests samples scripts themes languages fonts licenses DESTINATION "${GAME_DATADIR}" PATTERN ".git" EXCLUDE)
-   IF(DESKTOP_INSTALL)
diff --git a/srcpkgs/opensurge/patches/fix_ssize_t.patch b/srcpkgs/opensurge/patches/fix-ssize.patch
similarity index 100%
rename from srcpkgs/opensurge/patches/fix_ssize_t.patch
rename to srcpkgs/opensurge/patches/fix-ssize.patch
diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index 5fb036d9253..1e8d42c4fa8 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -1,7 +1,7 @@
 # Template file for 'opensurge'
 pkgname=opensurge
-version=0.5.1.2
-revision=4
+version=0.5.2
+revision=1
 build_style=cmake
 hostmakedepends="surgescript pkg-config"
 makedepends="allegro5-devel surgescript surgescript-devel"
@@ -10,5 +10,9 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://opensurge2d.org/"
 distfiles="https://github.com/alemart/opensurge/archive/v${version}.tar.gz"
-checksum=d060e3215231741ce0b4e5b897af52f8755c57660c8a33856bf921c83af18ba2
+checksum=838b8ba506e45c800091d8ba7bb830d024907934fba35bf369d92fe13feaa3de
 replaces="opensurge-data>=0"
+
+pre_configure() {
+	vsed -i CMakeLists.txt -e 's/GAME_BINDIR "games"/GAME_BINDIR "bin"/'
+}

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

* Re: [PR PATCH] [Merged]: opensurge: update to 0.5.2.
  2021-01-27 17:31 [PR PATCH] opensurge: update to 0.5.2 abenson
  2021-01-27 18:04 ` [PR PATCH] [Updated] " abenson
@ 2021-01-27 18:11 ` abenson
  1 sibling, 0 replies; 3+ messages in thread
From: abenson @ 2021-01-27 18:11 UTC (permalink / raw)
  To: ml

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

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

opensurge: update to 0.5.2.
https://github.com/void-linux/void-packages/pull/28265

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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.)
- [X] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

end of thread, other threads:[~2021-01-27 18:11 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-27 17:31 [PR PATCH] opensurge: update to 0.5.2 abenson
2021-01-27 18:04 ` [PR PATCH] [Updated] " abenson
2021-01-27 18:11 ` [PR PATCH] [Merged]: " abenson

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