From d859560220552c491076d8a9aa7c2ed185a0c564 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 15 Apr 2023 15:54:54 +0200
Subject: [PATCH] libspiro, disable static library, add conflict to devel
 package (#8403)

---
 media-libs/libspiro/libspiro-20220722.recipe      | 7 ++++---
 media-libs/libspiro/libspiro0-20180219~git.recipe | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/media-libs/libspiro/libspiro-20220722.recipe b/media-libs/libspiro/libspiro-20220722.recipe
index 9c8a4d61f..b153d3e72 100644
--- a/media-libs/libspiro/libspiro-20220722.recipe
+++ b/media-libs/libspiro/libspiro-20220722.recipe
@@ -11,7 +11,7 @@ HOMEPAGE="https://homepage/of/projectx.org"
 COPYRIGHT="2007 Raph Levien
 	George Williams"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/fontforge/libspiro/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="22409086ac07b482267c5328acde1956ca84cee8b4fa6c386f89e7014ea331da"
 
@@ -55,7 +55,7 @@ defineDebugInfoPackage libspiro$secondaryArchSuffix \
 BUILD()
 {
 	autoreconf -vfi
-	runConfigure ./configure
+	runConfigure ./configure --disable-static
 	make $jobArgs
 }
 
@@ -70,7 +70,8 @@ INSTALL()
 	fixPkgconfig
 
 	packageEntries devel \
-		$developDir
+		$developDir \
+		$manDir
 }
 
 TEST()
diff --git a/media-libs/libspiro/libspiro0-20180219~git.recipe b/media-libs/libspiro/libspiro0-20180219~git.recipe
index b061b8029..47aa128ba 100644
--- a/media-libs/libspiro/libspiro0-20180219~git.recipe
+++ b/media-libs/libspiro/libspiro0-20180219~git.recipe
@@ -11,7 +11,7 @@ HOMEPAGE="https://homepage/of/projectx.org"
 COPYRIGHT="2007 Raph Levien
 	George Williams"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="3"
 srcGitRev="8c7a31eda7dbd097fd0fae19ca7c7a67bc489d02"
 SOURCE_URI="https://github.com/fontforge/libspiro/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="79afdbbc15a30a0acc822123476c7713c800776a6e91bd9042ddc19950172cf0"
@@ -39,6 +39,9 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libspiro0$secondaryArchSuffix == $portVersion base
 	"
+CONFLICTS_devel="
+	libspiro${secondaryArchSuffix}_devel
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -58,7 +61,7 @@ defineDebugInfoPackage libspiro0$secondaryArchSuffix \
 BUILD()
 {
 	autoreconf -vfi
-	runConfigure ./configure
+	runConfigure ./configure --disable-static
 	make $jobArgs
 }