haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-03 05:28:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

freedroidrpg, bump revision for issues libpng16/libSDL_*_1.2 (#3883)

Browse Source
This commit is contained in:
Schrijvers Luc
2019-06-16 17:06:30 +02:00
committed by waddlesplash
parent 722d477ea2
commit 8591236b04
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
games-rpg/freedroidrpg/freedroidrpg-0.16.1.recipe
View File

@@ -20,10 +20,11 @@ they can fully express their creativity."
HOMEPAGE="http://freedroid.org" HOMEPAGE="http://freedroid.org"
COPYRIGHT="2002-2015 The Freedroid team" COPYRIGHT="2002-2015 The Freedroid team"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="3" REVISION="4"
SOURCE_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-0.16/freedroidRPG-$portVersion.tar.gz" SOURCE_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-0.16/freedroidRPG-$portVersion.tar.gz"
CHECKSUM_SHA256="426df175034b12095e7498fd80c907e507667c960ee1da331d9e5566d1b09358" CHECKSUM_SHA256="426df175034b12095e7498fd80c907e507667c960ee1da331d9e5566d1b09358"
SOURCE_DIR="freedroidrpg-$portVersion" SOURCE_DIR="freedroidrpg-$portVersion"
PATCHES="freedroidrpg-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64" ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="x86"
@@ -41,14 +42,14 @@ PROVIDES="
REQUIRES=" REQUIRES="
freedroidrpg_data == $portVersion freedroidrpg_data == $portVersion
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
lib:libgl$secondaryArchSuffix lib:libGL$secondaryArchSuffix
lib:libglu$secondaryArchSuffix lib:libGLU$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix
lib:libogg$secondaryArchSuffix lib:libogg$secondaryArchSuffix
lib:libpng$secondaryArchSuffix lib:libpng16$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix lib:libSDL_1.2$secondaryArchSuffix
lib:libsdl_gfx$secondaryArchSuffix lib:libSDL_gfx$secondaryArchSuffix
lib:libsdl_image$secondaryArchSuffix lib:libSDL_image_1.2$secondaryArchSuffix
#lib:libsdl_mixer$secondaryArchSuffix #lib:libsdl_mixer$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix
lib:libz$secondaryArchSuffix lib:libz$secondaryArchSuffix
@@ -65,14 +66,14 @@ REQUIRES_data="
BUILD_REQUIRES=" BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel haiku${secondaryArchSuffix}_devel
devel:libgl$secondaryArchSuffix devel:libGL$secondaryArchSuffix
devel:libglu$secondaryArchSuffix devel:libGLU$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix
devel:libogg$secondaryArchSuffix devel:libogg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix devel:libpng$secondaryArchSuffix
devel:libsdl$secondaryArchSuffix devel:libSDL$secondaryArchSuffix
devel:libsdl_gfx$secondaryArchSuffix devel:libSDL_gfx$secondaryArchSuffix
devel:libsdl_image$secondaryArchSuffix devel:libSDL_image$secondaryArchSuffix
#devel:libsdl_mixer$secondaryArchSuffix #devel:libsdl_mixer$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix
devel:libz$secondaryArchSuffix devel:libz$secondaryArchSuffix
@@ -126,6 +127,7 @@ INSTALL()
mv $binDir/freedroidRPG $appsDir mv $binDir/freedroidRPG $appsDir
packageEntries data $dataDir packageEntries data \
$dataDir
addAppDeskbarSymlink $appsDir/freedroidRPG "FreedroidRPG" addAppDeskbarSymlink $appsDir/freedroidRPG "FreedroidRPG"
} }

22
games-rpg/freedroidrpg/patches/freedroidrpg-0.16.1.patchset Normal file
View File

@@ -0,0 +1,22 @@
From 43aa0668062fd66325c5733bc3949926a1c7a248 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 15 Jun 2019 12:25:55 +0200
Subject: Don't pass -rdynamic on Haiku
diff --git a/configure.ac b/configure.ac
index 7f20cd4..b34b9c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,7 +142,7 @@ AS_CASE([$target],
],
[
AS_VAR_APPEND([FD_CPPFLAGS], [" -DFD_DATADIR='\"\$(pkgdatadir)\"'"])
- AS_VAR_APPEND([FD_LDFLAGS], [" -rdynamic -Wl,--as-needed"])
+ AS_VAR_APPEND([FD_LDFLAGS], [" -Wl,--as-needed"])
default_open_cmd="xdg-open"
]
)
--
2.21.0