From 79e95cdfc7854cf879c2bf95f8cabf2c83f36650 Mon Sep 17 00:00:00 2001
From: Andrew Lindesay <apl@lindesay.co.nz>
Date: Mon, 19 Jan 2026 20:34:20 +1300
Subject: [PATCH] HaikuDepot: Fix x86gcc2 build

Change-Id: I12f4982b160e52ed171a3229b5de3555fb50a516
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10244
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
---
 src/apps/haikudepot/icon/PackageIconTarRepository.cpp       | 2 +-
 src/apps/haikudepot/model/PackageInfoListener.h             | 6 ++++--
 .../haikudepot/packagemodel/PackageClassificationInfo.cpp   | 2 +-
 src/apps/haikudepot/ui/SharedIcons.cpp                      | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/apps/haikudepot/icon/PackageIconTarRepository.cpp b/src/apps/haikudepot/icon/PackageIconTarRepository.cpp
index 49fa96f81a..b9c54a41c5 100644
--- a/src/apps/haikudepot/icon/PackageIconTarRepository.cpp
+++ b/src/apps/haikudepot/icon/PackageIconTarRepository.cpp
@@ -234,7 +234,7 @@ PackageIconTarRepository::GetIcon(const BString& pkgName, uint32 size,
 	} else {
 		off_t iconDataTarOffset = -1;
 		const IconTarPtrRef tarPtrRef = _GetIconTarPtr(pkgName);
-		BitmapSize storedSize;
+		BitmapSize storedSize = BITMAP_SIZE_ANY;
 
 		if (tarPtrRef.IsSet()) {
 			storedSize = _BestStoredSize(tarPtrRef, size);
diff --git a/src/apps/haikudepot/model/PackageInfoListener.h b/src/apps/haikudepot/model/PackageInfoListener.h
index c91b4ab5fa..121614aafc 100644
--- a/src/apps/haikudepot/model/PackageInfoListener.h
+++ b/src/apps/haikudepot/model/PackageInfoListener.h
@@ -13,6 +13,8 @@
 #include <String.h>
 #include <Referenceable.h>
 
+#include "PackageInfo.h"
+
 
 enum {
 	PKG_CHANGED_LOCALIZED_TEXT				= 1 << 0,
@@ -28,8 +30,8 @@ enum {
 };
 
 
-class PackageInfo;
-typedef BReference<PackageInfo>	PackageInfoRef;
+//class PackageInfo;
+//typedef BReference<PackageInfo>	PackageInfoRef;
 
 
 /*!	PackageInfoChangeEvent is akin to the PackageChangeEvent but couples a
diff --git a/src/apps/haikudepot/packagemodel/PackageClassificationInfo.cpp b/src/apps/haikudepot/packagemodel/PackageClassificationInfo.cpp
index 986438dedc..f31d311756 100644
--- a/src/apps/haikudepot/packagemodel/PackageClassificationInfo.cpp
+++ b/src/apps/haikudepot/packagemodel/PackageClassificationInfo.cpp
@@ -164,7 +164,7 @@ PackageClassificationInfo::operator!=(const PackageClassificationInfo& other) co
 PackageClassificationInfoBuilder::PackageClassificationInfoBuilder()
 	:
 	fCategories(),
-	fProminence(-1L),
+	fProminence(PROMINANCE_ORDERING_NONE),
 	fIsDesktop(false),
 	fIsNativeDesktop(false)
 {
diff --git a/src/apps/haikudepot/ui/SharedIcons.cpp b/src/apps/haikudepot/ui/SharedIcons.cpp
index b0dc9dc06e..9aeacd72c0 100644
--- a/src/apps/haikudepot/ui/SharedIcons.cpp
+++ b/src/apps/haikudepot/ui/SharedIcons.cpp
@@ -132,7 +132,7 @@ SharedIcons::_CreateIconForResource(int32 resourceID, uint32 size)
 	BitmapHolderRef result(NULL);
 
 	if (SharedIcons::_CreateIconForResourceChecked(resourceID, size, &result) != B_OK) {
-		HDERROR("unable to create bitmap for resource [%d]", resourceID);
+		HDERROR("unable to create bitmap for resource [%" B_PRId32 "]", resourceID);
 		debugger("unable to create bitmap for resource");
 			// the resource is bundled into the build product so not being able to find it is an
 			// illegal state.
@@ -171,7 +171,7 @@ SharedIcons::_CreateIconForResourceChecked(int32 resourceID, uint32 size,
 		data = resources.LoadResource(B_VECTOR_ICON_TYPE, resourceID, &dataSize);
 
 	if (data == NULL) {
-		HDERROR("unable to read the resource [%d]", resourceID);
+		HDERROR("unable to read the resource [%" B_PRId32 "]", resourceID);
 		status = B_ERROR;
 	}
 
@@ -183,7 +183,7 @@ SharedIcons::_CreateIconForResourceChecked(int32 resourceID, uint32 size,
 		status = BIconUtils::GetVectorIcon(reinterpret_cast<const uint8*>(data), dataSize, bitmap);
 
 	if (status != B_OK) {
-		HDERROR("unable to parse the resource [%d] as a vector icon", resourceID);
+		HDERROR("unable to parse the resource [%" B_PRId32 "] as a vector icon", resourceID);
 		delete bitmap;
 		bitmap = NULL;
 	} else {