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

libclaw: various fixes.

Browse Source
This commit is contained in:
Adrien Destugues
2014-05-01 10:20:49 +02:00
parent 57fb59495f
commit eb50a4e921
2 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dev-libs/libclaw/libclaw-1.7.4.recipe
View File

@@ -33,12 +33,20 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libclaw$secondaryArchSuffix = $portVersion
lib:libclaw$secondaryArchSuffix
lib:libclaw_application$secondaryArchSuffix
lib:libclaw_configuration_file$secondaryArchSuffix
lib:libclaw_dynamic_library$secondaryArchSuffix
lib:libclaw_graphic$secondaryArchSuffix
lib:libclaw_logger$secondaryArchSuffix
lib:libclaw_net$secondaryArchSuffix
lib:libclaw_tween$secondaryArchSuffix
cmd:claw_config
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libstdc++$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -48,15 +56,15 @@ BUILD_REQUIRES="
devel:libjpeg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
boost_devel${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:cmake
cmd:cmake >= 3.0
cmd:make
cmd:gettext
"
PATCHES="libclaw-$portVersion.patchset"
@@ -70,6 +78,10 @@ INSTALL()
{
make install
prepareInstalledDevelLibs libclaw_application libclaw_configuration_file \
libclaw_dynamic_library libclaw_graphic libclaw_logger libclaw_net \
libclaw_tween
packageEntries devel $developDir $libDir/libclaw/
}
@@ -79,7 +91,13 @@ TEST() {
PROVIDES_devel="
libclaw${secondaryArchSuffix}_devel = $portVersion
devel:libclaw$secondaryArchSuffix
devel:libclaw_application$secondaryArchSuffix
devel:libclaw_configuration_file$secondaryArchSuffix
devel:libclaw_dynamic_library$secondaryArchSuffix
devel:libclaw_graphic$secondaryArchSuffix
devel:libclaw_logger$secondaryArchSuffix
devel:libclaw_net$secondaryArchSuffix
devel:libclaw_tween$secondaryArchSuffix
"
REQUIRES_devel="

61
dev-libs/libclaw/patches/libclaw-1.7.4.patchset
View File

@@ -1,4 +1,4 @@
From 3741d051e648f729859cb3957be8cfb35a3263c1 Mon Sep 17 00:00:00 2001
From fa045ed22d1276b0c7deae6f5ca5cf71a58dbe3d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Apr 2014 18:04:49 +0200
Subject: Add missing include.
@@ -20,7 +20,7 @@ index 16761ab..bc471b0 100644
1.8.3.4
From 5e3860a46838f92828846b2f8408ea2a458ae9b8 Mon Sep 17 00:00:00 2001
From f8da4cf7165d68763faa5f3955c79b2f1fff7e32 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Apr 2014 18:09:50 +0200
Subject: Fix installation paths for Haiku.
@@ -87,3 +87,60 @@ index f0973ac..8de90bd 100644
--
1.8.3.4
From 5850bb81673005cf0101b5470749792989a380eb Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 6 Apr 2014 14:34:30 +0200
Subject: Fix claw-config to do the right thing.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66607b0..89f0d4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,19 +28,20 @@ if(SVN_ENTRIES)
endif(SVN_ENTRIES)
if (HAIKU)
-set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/develop/headers/" )
-set( CLAW_INSTALLDIR_DOC data/doc/libclaw${CLAW_VERSION_MAJOR}/ )
-set( CLAW_TRANSLATIONS_INSTALL_DIR "data/locale" )
-set( CLAW_INSTALLDIR_SOURCE develop/headers/claw/ )
+ set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/develop/headers/${CMAKE_HAIKU_SECONDARY_ARCH}" )
+ set( CLAW_INSTALLDIR_DOC data/doc/libclaw${CLAW_VERSION_MAJOR}/ )
+ set( CLAW_TRANSLATIONS_INSTALL_DIR "data/locale" )
+ set( CLAW_INSTALLDIR_SOURCE develop/headers/${CMAKE_HAIKU_SECONDARY_ARCH}/claw/ )
+ set( CLAW_INSTALLDIR_LIB lib/${CMAKE_HAIKU_SECONDARY_ARCH}/ )
else()
-set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
-set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
-set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
-set( CLAW_INSTALLDIR_SOURCE include/claw/ )
+ set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
+ set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
+ set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
+ set( CLAW_INSTALLDIR_SOURCE include/claw/ )
+ set( CLAW_INSTALLDIR_LIB lib/ )
endif()
set( CLAW_CODE_DIR claw/code/ )
-set( CLAW_INSTALLDIR_LIB lib/ )
set( CLAW_EXECUTABLE_DIR bin/ )
set( CLAW_LIBRARIES
diff --git a/claw-config.in b/claw-config.in
index 73b2b10..c0a8fa5 100755
--- a/claw-config.in
+++ b/claw-config.in
@@ -140,7 +140,7 @@ while test $# -gt 0; do
echo -I$CLAW_INCLUDE_DIRECTORY
;;
--libs)
- libdirs="-L${exec_prefix}/lib "
+ libdirs="-L${exec_prefix}/@CLAW_INSTALLDIR_LIB@ "
echo -n "$libdirs"
echo $(print_libraries)
--
1.8.3.4