From 334582d02c381873a06887e74404abb029594ea0 Mon Sep 17 00:00:00 2001
From: OscarL <oscar.lesta@gmail.com>
Date: Tue, 2 Dec 2025 06:45:44 -0300
Subject: [PATCH] libsolv: update to 0.7.35, but keep recipe disabled. (#13290)

Haiku uses a vendored-in libsolv (based on a "patched for Haiku" 0.3.0)
since hrev57880.

This updated recipe is for the unmodified upstream (OpenSUSE) version,
just in case some one wants to toy with it (but kept disabled, as
nothing really requires it).
---
 ...014_12_22.recipe => libsolv-0.7.35.recipe} | 65 ++++++++++++-------
 1 file changed, 43 insertions(+), 22 deletions(-)
 rename dev-libs/libsolv/{libsolv-0.3.0_haiku_2014_12_22.recipe => libsolv-0.7.35.recipe} (51%)

diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe b/dev-libs/libsolv/libsolv-0.7.35.recipe
similarity index 51%
rename from dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe
rename to dev-libs/libsolv/libsolv-0.7.35.recipe
index bc5767aa3..4560b3438 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe
+++ b/dev-libs/libsolv/libsolv-0.7.35.recipe
@@ -3,15 +3,14 @@ DESCRIPTION="A Library for solving packages and reading repositories."
 HOMEPAGE="https://github.com/openSUSE/libsolv"
 COPYRIGHT="2007-2013, Novell Inc."
 LICENSE="BSD (3-clause)"
-REVISION="5"
-srcGitRev="da2650933f85f5a30d8146bfb22af53d2620d0c7"
-SOURCE_URI="https://github.com/weinhold/libsolv/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="79aa7772bfe403f003e8063480ddc3d4f491b3f5d7b8cace610605fba3318150"
+REVISION="1"
+SOURCE_URI="https://github.com/openSUSE/libsolv/archive/refs/tags/$portVersion.tar.gz"
+CHECKSUM_SHA256="e6ef552846f908beb3bbf6ca718b6dd431bd8a281086d82af9a6d2a3ba919be5"
 SOURCE_FILENAME="libsolv-$portVersion.tar.gz"
-SOURCE_DIR="libsolv-$srcGitRev"
+SOURCE_DIR="libsolv-$portVersion"
 
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="?all"
+SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	libsolv$secondaryArchSuffix = $portVersion
@@ -33,6 +32,19 @@ REQUIRES_devel="
 	libsolv${secondaryArchSuffix} == $portVersion base
 	"
 
+PROVIDES_tools="
+	libsolv${secondaryArchSuffix}_tools = $portVersion
+	cmd:dumpsolv${secondaryArchSuffix} = $portVersion
+	cmd:installcheck${secondaryArchSuffix} = $portVersion
+	cmd:mergesolv${secondaryArchSuffix} = $portVersion
+	cmd:repo2solv${secondaryArchSuffix} = $portVersion
+	cmd:testsolv${secondaryArchSuffix} = $portVersion
+	"
+REQUIRES_tools="
+	libsolv${secondaryArchSuffix} == $portVersion base
+	haiku$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	devel:libexpat$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -48,19 +60,15 @@ BUILD_PREREQUIRES="
 
 PATCH()
 {
-	sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt
-	sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, \
-		src/CMakeLists.txt ext/CMakeLists.txt
-	sed -i 's,${CMAKE_INSTALL_PREFIX}/share/cmake/Modules',$dataDir/cmake/Modules, \
-		CMakeLists.txt
+	sed -i 's,${CMAKE_INSTALL_PREFIX}/share/cmake/Modules',$dataDir/cmake/Modules, CMakeLists.txt
 }
 
 BUILD()
 {
-	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
-		-DLIB=$relativeLibDir \
-		-DINCLUDE=$relativeIncludeDir
+	cmake -B build -S . \
+		-DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs
+
 	make -C build $jobArgs
 }
 
@@ -68,15 +76,12 @@ INSTALL()
 {
 	make -C build install
 
-	# add the manpage for libsolv
-	mkdir -p $manDir/man3
-	cp doc/libsolv.3 $manDir/man3
-
 	# set up the develop directory correctly
 	prepareInstalledDevelLibs libsolv libsolvext
 
-	# We don't want the executables.
-	rm -r $prefix/bin
+	packageEntries tools \
+		$binDir \
+		$manDir/man1
 
 	# devel package
 	packageEntries devel \
@@ -84,3 +89,19 @@ INSTALL()
 		$developDir \
 		$manDir
 }
+
+# Reference results on beta5 x86_64:
+# 75% tests passed, 7 tests failed out of 28
+# Total Test time (real) =  10.95 sec
+# The following tests FAILED:
+#           2 - alternative (Failed)
+#           3 - blacklist (Failed)
+#           8 - distupgrade (Failed)
+#          11 - favor (Failed)
+#          14 - lock (Failed)
+#          20 - sat (Failed)
+#          24 - targeted (Failed)
+TEST()
+{
+	ctest --test-dir build --output-on-failure
+}