From a46f997ee71ecbd50e98cf5d6be686a4321159c5 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sun, 6 Sep 2020 02:10:02 -0400 Subject: games/asc: Fix broken build. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- games/asc/asc.SlackBuild | 8 ++++++- games/asc/libphysfs-3.0.1.patch | 50 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 games/asc/libphysfs-3.0.1.patch (limited to 'games') diff --git a/games/asc/asc.SlackBuild b/games/asc/asc.SlackBuild index 816bf1100f..82415dea1f 100644 --- a/games/asc/asc.SlackBuild +++ b/games/asc/asc.SlackBuild @@ -22,9 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20200906 bkw: modified by SlackBuilds.org: added patch to support +# physfs 3.0.1. + PRGNAM=asc VERSION=${VERSION:-2.6.1.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +72,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# 20200906 bkw: Patch borrowed from Debian, with thanks. +patch -p1 < $CWD/libphysfs-3.0.1.patch + # convert asc logo icon .gif to .png format convert data/icon_asc.gif $PRGNAM.png diff --git a/games/asc/libphysfs-3.0.1.patch b/games/asc/libphysfs-3.0.1.patch new file mode 100644 index 0000000000..7e1cd12782 --- /dev/null +++ b/games/asc/libphysfs-3.0.1.patch @@ -0,0 +1,50 @@ +From: Markus Koschany +Date: Fri, 17 Nov 2017 19:08:04 +0100 +Subject: libphysfs 3.0.1 + +Bug-Debian: https://bugs.debian.org/881998 +Forwarded: http://battle-planet.de/pbp/board/viewtopic.php?f=128&t=6717 +--- + source/libs/paragui/src/core/physfsrwops.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/source/libs/paragui/src/core/physfsrwops.h b/source/libs/paragui/src/core/physfsrwops.h +index 91ff2eb..a259622 100644 +--- a/source/libs/paragui/src/core/physfsrwops.h ++++ b/source/libs/paragui/src/core/physfsrwops.h +@@ -39,7 +39,7 @@ extern "C" { + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); ++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); + + /** + * Open a platform-independent filename for writing, and make it accessible +@@ -51,7 +51,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); ++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); + + /** + * Open a platform-independent filename for appending, and make it accessible +@@ -63,7 +63,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); ++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); + + /** + * Make a SDL_RWops from an existing PhysicsFS file handle. You should +@@ -75,7 +75,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +-__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle); ++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle); + + #ifdef __cplusplus + } -- cgit v1.2.3