Flat commit of all changes from package-management branch in svn

src/apps/aboutsystem/AboutSystem.cpp

@@ -555,28 +555,10 @@ AboutView::AboutView()
 	versionView->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT,
 		B_ALIGN_VERTICAL_UNSET));
 
-	// GCC version
-	BEntry gccFourHybrid("/boot/system/lib/gcc2/libstdc++.r4.so");
-	BEntry gccTwoHybrid("/boot/system/lib/gcc4/libsupc++.so");
-	bool isHybrid = gccFourHybrid.Exists() || gccTwoHybrid.Exists();
-
-	if (isHybrid) {
-		snprintf(string, sizeof(string), B_TRANSLATE("GCC %d Hybrid"),
-			__GNUC__);
-	} else
-		snprintf(string, sizeof(string), "GCC %d", __GNUC__);
-
-	BStringView* gccView = new BStringView("gcctext", string);
-	gccView->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT,
+	BStringView* abiView = new BStringView("abitext", B_HAIKU_ABI_NAME);
+	abiView->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT,
 		B_ALIGN_VERTICAL_UNSET));
 
-#if __GNUC__ == 2
-	if (isHybrid) {
-		// do now show the GCC version if it's the default
-		gccView->Hide();
-	}
-#endif
-
 	// CPU count, type and clock speed
 	char processorLabel[256];
 	if (systemInfo.cpu_count > 1) {
@@ -643,7 +625,7 @@ AboutView::AboutView()
 			.AddGroup(B_VERTICAL, 0)
 				.Add(_CreateLabel("oslabel", B_TRANSLATE("Version:")))
 				.Add(versionView)
-				.Add(gccView)
+				.Add(abiView)
 				.AddStrut(offset)
 				.Add(_CreateLabel("cpulabel", processorLabel))
 				.Add(cpuView)