From dd2ab027fee04b39412f0f5032e549bee54513fe Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 27 Jun 2011 03:53:12 +0200
Subject: [PATCH] Support for parsing the compatible version

In the .PackageInfo the compatible version for a resolvable can
optionally be given after the resolvable version via
"'compat[ible]' '>=' <version>".
---
 src/kits/package/PackageInfo.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/kits/package/PackageInfo.cpp b/src/kits/package/PackageInfo.cpp
index aac8492f08..8f7a6f510a 100644
--- a/src/kits/package/PackageInfo.cpp
+++ b/src/kits/package/PackageInfo.cpp
@@ -558,6 +558,7 @@ BPackageInfo::Parser::_ParseResolvableList(
 				}
 			}
 
+			// parse version
 			BPackageVersion version;
 			Token op = parser._NextToken();
 			if (op.type == TOKEN_OPERATOR_ASSIGN)
@@ -567,7 +568,22 @@ BPackageInfo::Parser::_ParseResolvableList(
 			else
 				throw ParseError("expected '=', comma or ']'", op.pos);
 
-			value->AddItem(new BPackageResolvable(token.text, type, version));
+			// parse compatible version
+			BPackageVersion compatibleVersion;
+			Token compatible = parser._NextToken();
+			if (compatible.type == TOKEN_WORD
+				&& (compatible.text == "compat"
+					|| compatible.text == "compatible")) {
+				op = parser._NextToken();
+				if (op.type == TOKEN_OPERATOR_GREATER_EQUAL) {
+					parser._ParseVersionValue(&compatibleVersion, true);
+				} else
+					parser._RewindTo(compatible);
+			} else
+				parser._RewindTo(compatible);
+
+			value->AddItem(new BPackageResolvable(token.text, type, version,
+				compatibleVersion));
 		}
 	} resolvableParser(*this, value);