diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.16.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.16.1.recipe index ce9b9d1eb..085ef37f0 100644 --- a/games-rpg/freedroidrpg/freedroidrpg-0.16.1.recipe +++ b/games-rpg/freedroidrpg/freedroidrpg-0.16.1.recipe @@ -20,10 +20,11 @@ they can fully express their creativity." HOMEPAGE="http://freedroid.org" COPYRIGHT="2002-2015 The Freedroid team" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="4" SOURCE_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-0.16/freedroidRPG-$portVersion.tar.gz" CHECKSUM_SHA256="426df175034b12095e7498fd80c907e507667c960ee1da331d9e5566d1b09358" SOURCE_DIR="freedroidrpg-$portVersion" +PATCHES="freedroidrpg-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -41,14 +42,14 @@ PROVIDES=" REQUIRES=" freedroidrpg_data == $portVersion haiku$secondaryArchSuffix - lib:libgl$secondaryArchSuffix - lib:libglu$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libGLU$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libogg$secondaryArchSuffix - lib:libpng$secondaryArchSuffix - lib:libsdl$secondaryArchSuffix - lib:libsdl_gfx$secondaryArchSuffix - lib:libsdl_image$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix + lib:libSDL_1.2$secondaryArchSuffix + lib:libSDL_gfx$secondaryArchSuffix + lib:libSDL_image_1.2$secondaryArchSuffix #lib:libsdl_mixer$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -65,14 +66,14 @@ REQUIRES_data=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libgl$secondaryArchSuffix - devel:libglu$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libGLU$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libpng$secondaryArchSuffix - devel:libsdl$secondaryArchSuffix - devel:libsdl_gfx$secondaryArchSuffix - devel:libsdl_image$secondaryArchSuffix + devel:libSDL$secondaryArchSuffix + devel:libSDL_gfx$secondaryArchSuffix + devel:libSDL_image$secondaryArchSuffix #devel:libsdl_mixer$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -126,6 +127,7 @@ INSTALL() mv $binDir/freedroidRPG $appsDir - packageEntries data $dataDir + packageEntries data \ + $dataDir addAppDeskbarSymlink $appsDir/freedroidRPG "FreedroidRPG" } diff --git a/games-rpg/freedroidrpg/patches/freedroidrpg-0.16.1.patchset b/games-rpg/freedroidrpg/patches/freedroidrpg-0.16.1.patchset new file mode 100644 index 000000000..f88f3c0e4 --- /dev/null +++ b/games-rpg/freedroidrpg/patches/freedroidrpg-0.16.1.patchset @@ -0,0 +1,22 @@ +From 43aa0668062fd66325c5733bc3949926a1c7a248 Mon Sep 17 00:00:00 2001 +From: begasus +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 +