From 8897c24ed67b351f4ed94436d28e18f3d7e27da3 Mon Sep 17 00:00:00 2001
From: Juha <juha@lazarus-ide.org>
Date: Sun, 12 Jun 2022 17:55:08 +0300
Subject: [PATCH] Packager: Use pure package name of a dependency when
 searching online packages.

(cherry picked from commit f5321043f4e6724f01493728333e1d9300f4a435)
---
 packager/packageeditor.pas       | 12 +++++++++---
 packager/projpackfilepropgui.pas |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas
index 1cccdf6c89..b8cf31984e 100644
--- a/packager/packageeditor.pas
+++ b/packager/packageeditor.pas
@@ -727,7 +727,7 @@ var
   end;
 
 var
-  Writable: Boolean;
+  OpenItemEnable, Writable: Boolean;
   OpenItemCapt: String;
 begin
   //debugln(['TPackageEditorForm.FilesPopupMenuPopup START ',ItemsPopupMenu.Items.Count]);
@@ -737,6 +737,7 @@ begin
   try
     CollectSelected;
     OpenItemCapt := lisOpen;  // May be changed later.
+    OpenItemEnable := True;
     Writable := not LazPackage.ReadOnly;
 
     // items for Files node and for selected files, under section PkgEditMenuSectionFile
@@ -789,10 +790,14 @@ begin
       if Assigned(SingleSelectedDep) then
         case SingleSelectedDep.LoadPackageResult of
           lprAvailableOnline:
-            OpenItemCapt:=lisPckEditInstall;
+            OpenItemCapt := lisPckEditInstall;
           lprNotFound:
             if Assigned(OPMInterface) and not OPMInterface.IsPackageListLoaded then
-              OpenItemCapt:=lisPckEditCheckAvailabilityOnline;
+              OpenItemCapt := lisPckEditCheckAvailabilityOnline
+            else begin
+              //OpenItemCapt := lisUENotFound;
+              OpenItemEnable := False;
+            end;
         end;
       SetItem(PkgEditMenuRemoveDependency, @RemoveBitBtnClick,
               pstdep in UserSelection, Writable);
@@ -808,6 +813,7 @@ begin
               Assigned(LazPackage.FirstRequiredDependency), Writable);
     end;
     PkgEditMenuOpenFile.MenuItem.Caption := OpenItemCapt;
+    PkgEditMenuOpenFile.MenuItem.Enabled := OpenItemEnable;
   finally
     //PackageEditorMenuRoot.EndUpdate;
     SingleSelectedFile := Nil;
diff --git a/packager/projpackfilepropgui.pas b/packager/projpackfilepropgui.pas
index 3790f72596..184dacccbd 100644
--- a/packager/projpackfilepropgui.pas
+++ b/packager/projpackfilepropgui.pas
@@ -135,9 +135,9 @@ var
 begin
   Result := nil;
   if OPMInterface = Nil then Exit;
-  PackageLink := LazPackageLinks.FindLinkWithPkgName(ADependency.AsString);
+  PackageLink := LazPackageLinks.FindLinkWithPkgName(ADependency.PackageName);
   if Assigned(PackageLink) and (PackageLink.Origin = ploOnline)
-  and (ADependency.IsCompatible(PackageLink.Version)) then
+  and ADependency.IsCompatible(PackageLink.Version) then
   begin
     ADependency.LoadPackageResult := lprAvailableOnline;
     Result := PackageLink;