libharu, bump version, disable static library (#8361)

* libharu, bump version, disable static library * Move bindings to devel package
2026-04-09 05:10:05 +02:00 · 2023-04-14 14:28:26 +02:00
parent 9b7cc66e84
commit 2d8d67a40b
4 changed files with 102 additions and 138 deletions
--- a/media-libs/libharu/libharu-2.3.0.recipe
+++ b/media-libs/libharu/libharu-2.3.0.recipe
@@ -1,91 +0,0 @@
-SUMMARY="C/C++ library for PDF generation"
-DESCRIPTION="
-Haru is a free, cross platform, open-sourced software library for generating \
-PDF. It supports the following features.
-   1. Generating PDF files with lines, text, images.
-   2. Outline, text annotation, link annotation.
-   3. Compressing document with deflate-decode.
-   4. Embedding PNG, Jpeg images.
-   5. Embedding Type1 font and TrueType font.
-   6. Creating encrypted PDF files.
-   7. Using various character set (ISO8859-1~16, MSCP1250~8, KOI8-R).
-   8. Supporting CJK fonts and encodings.
-"
-HOMEPAGE="http://www.libharu.org/"
-COPYRIGHT="
-	2000-2006 Takeshi Kanno
-	2007-2009 Antony Dovgal et al.
-	"
-LICENSE="Zlib"
-REVISION="3"
-SOURCE_URI="https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz"
-CHECKSUM_SHA256="8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2"
-SOURCE_FILENAME="libharu-$portVersion.tar.gz"
-SOURCE_DIR="libharu-RELEASE_2_3_0"
-PATCHES="libharu-$portVersion.patchset"
-
-ARCHITECTURES="?all x86_gcc2 x86"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	libharu$secondaryArchSuffix = $portVersion compat >= 2
-	lib:libhpdf$secondaryArchSuffix = 2.3.0 compat >= 2
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libharu${secondaryArchSuffix}_devel = $portVersion compat >= 2
-	devel:libhpdf$secondaryArchSuffix = 2.3.0 compat >= 2
-	"
-REQUIRES_devel="
-	libharu$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libpng16$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	rm -rf build
-	mkdir build
-	cd build
-
-	cmake -DCMAKE_INSTALL_PREFIX=$prefix \
-		-DCMAKE_BUILD_TYPE=release ..
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-	make install
-
-	if [ -n "$secondaryArchSuffix" ]; then
-		mv $prefix/lib $prefix/lib2
-		mkdir -p $libDir
-		mv $prefix/lib2/* $libDir/
-		rmdir $prefix/lib2
-	fi
-
-	mv $libDir/libhpdfs.a $libDir/libhpdf.a
-	mv $libDir/libhpdf.so $libDir/libhpdf.so.2.3
-	ln -s libhpdf.so.2.3 $libDir/libhpdf.so
-	prepareInstalledDevelLibs libhpdf
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
--- a/media-libs/libharu/libharu-2.4.3.recipe
+++ b/media-libs/libharu/libharu-2.4.3.recipe
@@ -0,0 +1,78 @@
+SUMMARY="C/C++ library for PDF generation"
+DESCRIPTION="Haru is a free, cross platform, open-sourced software library for generating \
+PDF. It supports the following features.
+   1. Generating PDF files with lines, text, images.
+   2. Outline, text annotation, link annotation.
+   3. Compressing document with deflate-decode.
+   4. Embedding PNG, Jpeg images.
+   5. Embedding Type1 font and TrueType font.
+   6. Creating encrypted PDF files.
+   7. Using various character set (ISO8859-1~16, MSCP1250~8, KOI8-R).
+   8. Supporting CJK fonts and encodings."
+HOMEPAGE="http://www.libharu.org/"
+COPYRIGHT="2000-2006 Takeshi Kanno
+	2007-2009 Antony Dovgal et al."
+LICENSE="Zlib"
+REVISION="1"
+SOURCE_URI="https://github.com/libharu/libharu/archive/refs/tags/v$portVersion.tar.gz"
+CHECKSUM_SHA256="a2c3ae4261504a0fda25b09e7babe5df02b21803dd1308fdf105588f7589d255"
+SOURCE_FILENAME="libharu-$portVersion.tar.gz"
+PATCHES="libharu-$portVersion.patchset"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	libharu$secondaryArchSuffix = $portVersion
+	lib:libhpdf$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libharu${secondaryArchSuffix}_devel = $portVersion
+	devel:libhpdf$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libharu$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libpng16$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=release \
+		$cmakeDirArgs \
+		-DLIBHPDF_STATIC=NO
+	make -C build $jobArgs
+}
+
+INSTALL()
+{
+	make -C build install
+
+	ln -s libhpdf.so.$libVersion $libDir/libhpdf.so.2
+
+	prepareInstalledDevelLib libhpdf
+
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$dataDir
+}
--- a/media-libs/libharu/patches/libharu-2.3.0.patchset
+++ b/media-libs/libharu/patches/libharu-2.3.0.patchset
@@ -1,47 +0,0 @@
-From 3ad4249e4222d11b2a919e8174a3de01c147f97c Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Wed, 4 Jun 2014 17:26:56 +0000
-Subject: haiku patch
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 354ca75..cc1fef7 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -207,13 +207,9 @@ set(
- )
- 
- # install header files
-install(FILES ${haru_HDRS} DESTINATION include)
-+install(FILES ${haru_HDRS} DESTINATION "develop/headers")
- 
- # install various files
-install(FILES README CHANGES INSTALL DESTINATION .)
-if(NOT DEVPAK)
-  install(DIRECTORY if DESTINATION .)
-endif(NOT DEVPAK)
- if(DEVPAK)
-   install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .)
- endif(DEVPAK)
-diff --git a/cmake/modules/haru.cmake b/cmake/modules/haru.cmake
-index 95647b9..0495d6c 100644
--- a/cmake/modules/haru.cmake
-+++ b/cmake/modules/haru.cmake
-@@ -27,11 +27,11 @@ check_include_files(unistd.h LIBHPDF_HAVE_UNISTD_H)
- # =======================================================================
- # On windows systems the math library is not separated so do not specify
- # it unless you are on a non-windows system.
-if(NOT WIN32)
-+if(NOT WIN32 AND NOT HAIKU)
-   find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib)
-   if(NOT MATH_LIB)
-     message(FATAL_ERROR "Cannot find required math library")
-   endif(NOT MATH_LIB)
-else(NOT WIN32)
-+else(NOT WIN32 AND NOT HAIKU)
-   set(MATH_LIB)
-endif(NOT WIN32)
-+endif(NOT WIN32 AND NOT HAIKU)
-- 
-1.8.3.4
-
--- a/media-libs/libharu/patches/libharu-2.4.3.patchset
+++ b/media-libs/libharu/patches/libharu-2.4.3.patchset
@@ -0,0 +1,24 @@
+From b26703033c5d703db5e1ff29e025b2b138c03c96 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Thu, 13 Apr 2023 13:27:52 +0200
+Subject: fix
+
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b87af66..b919df9 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -73,6 +73,10 @@ set(
+ # create hpdf library
+ # =======================================================================
+ add_library(hpdf ${LIBHPDF_SRCS})
+set_target_properties(hpdf PROPERTIES
+    VERSION ${CMAKE_PROJECT_VERSION}
+    SOVERSION ${CMAKE_PROJECT_VERSION}
+)
+ if (PNG_FOUND)
+     include_directories (${PNG_INCLUDE_DIRS})
+     target_link_libraries (hpdf ${PNG_LIBRARIES})
+-- 
+2.37.3
+