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

Graphite: version bump, cleanup, libversioncompat, debuginfo (#3499)

Browse Source 
* Graphite: version bump, cleanup, libversioncompat, debuginfo

* Cleanup

* COPYRIGHT
This commit is contained in:
miqlas
2019-01-04 20:15:20 +01:00
committed by waddlesplash
parent b7ed0c4907
commit 9df30f7ff6
2 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
media-gfx/graphite2/graphite2-1.3.10.recipe → media-gfx/graphite2/graphite2-1.3.13.recipe
View File

@@ -2,28 +2,31 @@ SUMMARY="Graphite text processing engine"
DESCRIPTION="Graphite2 is a library providing rendering capabilities for \
complex non-Roman writing systems."
HOMEPAGE="http://graphite.sil.org/"
COPYRIGHT="2010-2016 SIL International"
COPYRIGHT="2010-2018 SIL International"
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="https://github.com/silnrsi/graphite/releases/download/$portVersion/graphite2-$portVersion.tgz"
CHECKSUM_SHA256="90fde3b2f9ea95d68ffb19278d07d9b8a7efa5ba0e413bebcea802ce05cda1ae"
CHECKSUM_SHA256="dd63e169b0d3cf954b397c122551ab9343e0696fb2045e1b326db0202d875f06"
PATCHES="graphite2-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
libVersion="3.2.1"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
graphite2$secondaryArchSuffix = $portVersion compat >= 1.2
lib:libgraphite2$secondaryArchSuffix = 3.0.1 compat >= 3
graphite2$secondaryArchSuffix = $portVersion
lib:libgraphite2$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
graphite2${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
graphite2${secondaryArchSuffix}_devel = $portVersion
cmd:gr2fonttest$secondaryArchSuffix
devel:libgraphite2$secondaryArchSuffix = 3.0.1 compat >= 3
devel:libgraphite2$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
graphite2$secondaryArchSuffix == $portVersion base
@@ -40,9 +43,15 @@ BUILD_PREREQUIRES="
cmd:make
"
defineDebugInfoPackage graphite2$secondaryArchSuffix \
"$libDir"/libgraphite2.so.$libVersion
BUILD()
{
cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DLIB_SUFFIX=$secondaryArchSubDir .
cmake \
-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
-DLIB_SUFFIX=$secondaryArchSubDir \
.
make $jobArgs
}
@@ -56,5 +65,11 @@ INSTALL()
# devel package
packageEntries devel \
$binDir \
$dataDir \
$developDir
}
TEST()
{
make test
}

44
media-gfx/graphite2/patches/graphite2-1.3.13.patchset Normal file
View File

@@ -0,0 +1,44 @@
From 9b8a74f9a3037ac423ab4edf27dbe9bab04b3fbe Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Mon, 6 Oct 2014 18:21:18 +0200
Subject: Fix install paths.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 496712d..55a0312 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ endif()
set(version 3.0.1)
set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+set(includedir ${CMAKE_INSTALL_PREFIX}/develop/headers${LIB_SUFFIX})
configure_file(graphite2.pc.in graphite2.pc)
diff --git a/gr2fonttest/CMakeLists.txt b/gr2fonttest/CMakeLists.txt
index f995dd3..81de17c 100644
--- a/gr2fonttest/CMakeLists.txt
+++ b/gr2fonttest/CMakeLists.txt
@@ -18,4 +18,4 @@ if (BUILD_SHARED_LIBS)
add_dependencies(${PROJECT_NAME}_copy_dll graphite2 gr2fonttest)
endif()
-install(TARGETS gr2fonttest EXPORT gr2fonttest RUNTIME DESTINATION bin)
+install(TARGETS gr2fonttest EXPORT gr2fonttest RUNTIME DESTINATION bin${LIB_SUFFIX})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 389cf5a..d26edf9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -152,5 +152,5 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
endif()
-install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
+install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION develop/headers${LIB_SUFFIX}/graphite2 RUNTIME DESTINATION bin${LIB_SUFFIX})
+install(EXPORT graphite2 DESTINATION data/graphite2 NAMESPACE gr2_)
--
2.19.1