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

Merged in tgkokk/haikuports/plee-the-bear (pull request #402)

Browse Source 
Fix Deskbar symlink to plee-the-bear
This commit is contained in:
Jerome Duval
2015-01-07 12:08:44 +01:00
parent a8eacbc521 6375af8cfb
commit 232c34090e
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset
View File

@@ -76,7 +76,7 @@ index 9ed5d32..ff88206 100644
--
1.8.3.4
From c929f602fb74adcdf495e144b66f4981c0655ba5 Mon Sep 17 00:00:00 2001
From d04f6bda69bbf66b5aa9e3dd8e06c0b6f487bc0f Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 6 Apr 2014 19:41:58 +0200
Subject: [PATCH 3/4] Fix install directories.
@@ -84,8 +84,8 @@ Subject: [PATCH 3/4] Fix install directories.
---
bear/cmake-helper/bear-config.cmake | 2 +-
bear/cmake-module/CMakeLists.txt | 2 +-
plee-the-bear/CMakeLists.txt | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
plee-the-bear/CMakeLists.txt | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bear/cmake-helper/bear-config.cmake b/bear/cmake-helper/bear-config.cmake
index e66d79e..b483445 100644
@@ -114,10 +114,10 @@ index e182689..24c2113 100644
set( BEAR_CMAKE_MODULES
diff --git a/plee-the-bear/CMakeLists.txt b/plee-the-bear/CMakeLists.txt
index 6a123d9..c3dbb90 100644
index 6a123d9..3d81af2 100644
--- a/plee-the-bear/CMakeLists.txt
+++ b/plee-the-bear/CMakeLists.txt
@@ -23,7 +23,7 @@ include( docbook-to-man )
@@ -23,12 +23,12 @@ include( docbook-to-man )
#-------------------------------------------------------------------------------
# where the game resources are installed
if( NOT PTB_INSTALL_DATA_DIR )
@@ -126,6 +126,12 @@ index 6a123d9..c3dbb90 100644
endif( NOT PTB_INSTALL_DATA_DIR )
# where the game executables are installed
if( NOT PTB_INSTALL_EXECUTABLE_DIR )
- set( PTB_INSTALL_EXECUTABLE_DIR bin )
+ set( PTB_INSTALL_EXECUTABLE_DIR bin${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} )
endif( NOT PTB_INSTALL_EXECUTABLE_DIR )
# where the game libraries (the items) are installed
@@ -38,7 +38,7 @@ if( NOT PTB_INSTALL_CUSTOM_LIBRARY_DIR )
"${PTB_INSTALL_EXECUTABLE_DIR}"
)
@@ -147,7 +153,7 @@ index 6a123d9..c3dbb90 100644
--
1.8.3.4
From 34aca4d0b287e50d35957badf3e72060264f7a45 Mon Sep 17 00:00:00 2001
From c842dde59df8ca44ecf4e318e8641bcc335e1ec5 Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Wed, 24 Dec 2014 23:53:14 +0200
Subject: [PATCH 4/4] Change settings location on Haiku

6
games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe
View File

@@ -19,8 +19,8 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
PROVIDES="
plee_the_bear = $portVersion
cmd:plee_the_bear = $portVersion
lib:libplee_the_bear$secondaryArchSuffix
cmd:plee_the_bear$secondaryArchSuffix = $portVersion
lib:libplee_the_bear$secondaryArchSuffix = $portVersion
lib:libbear_audio$secondaryArchSuffix
lib:libbear_communication$secondaryArchSuffix
lib:libbear_debug$secondaryArchSuffix
@@ -91,7 +91,7 @@ INSTALL()
make install
rm -r $prefix/share
addAppDeskbarSymlink $binDir/plee_the_bear "Plee the Bear"
addAppDeskbarSymlink $binDir/plee-the-bear "Plee the Bear"
}
# ----- DESCRIPTION -----------------------------------------------------------