haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Beezer: fix build for x86_gcc2

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-05-08 19:22:22 +10:00
parent 76f40a3032
commit 0ab7837faa
2 changed files with 105 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
haiku-apps/beezer/beezer-0.99.recipe
View File

@@ -7,7 +7,7 @@ HOMEPAGE="https://github.com/Teknomancer/beezer"
COPYRIGHT="2009 Ramshankar (aka Teknomancer)
2011-2019 Chris Roberts"
LICENSE="BSD (3-clause)"
REVISION="2"
REVISION="3"
srcGitRev="7395927e1c67dbe2243aa4f669acce3b96c20632"
SOURCE_URI="https://github.com/Teknomancer/beezer/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="20cb7d8d0e03a56ab1fd34b04c2afd1daf4fbc11d9c099e66ff3562405d054c2"

107
haiku-apps/beezer/patches/beezer-0.99.patchset
View File

@@ -1,4 +1,4 @@
From 1933182ed5b0b3c89e5ef72d82467ddc22f881e4 Mon Sep 17 00:00:00 2001
From 16648eafebca1069ebaca900839d9445b412a5f6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 7 May 2020 20:17:45 +1000
Subject: Fix drawing string issues
@@ -41,7 +41,7 @@ index 34a4697..821fc98 100644
2.26.0
From 0cd925179fe7f71fd3af2e30ddd409142460e643 Mon Sep 17 00:00:00 2001
From cab0f5097534131acd239d353bb65b3e75f74012 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 7 May 2020 20:24:49 +1000
Subject: Hide string views when infobar folded
@@ -73,7 +73,7 @@ index 48ecdd8..90a7fd8 100644
2.26.0
From f5a4dac4dedae81c471865a1c465b63fb1c88a18 Mon Sep 17 00:00:00 2001
From acbcc21eddeedaa842f948d6afdc5f4fb6d8b215 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 7 May 2020 20:26:17 +1000
Subject: Increase default width for columns
@@ -109,3 +109,104 @@ index 00337ed..38088b0 100644
--
2.26.0
From 29e6977173368ce8bdbb0506ab66c0a23fcbd728 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 8 May 2020 19:04:45 +1000
Subject: Fix build for x86_gcc2
diff --git a/Source/Archiver/Archiver.cpp b/Source/Archiver/Archiver.cpp
index 82cd760..704080c 100644
--- a/Source/Archiver/Archiver.cpp
+++ b/Source/Archiver/Archiver.cpp
@@ -702,9 +702,9 @@ void Archiver::SaveSettingsMenu()
// Remove the first 3 items which will be "Save as Defaults", "Save to archive" and separator item
// Then save the rest of the items,
- BMenuItem* item0 = m_settingsMenu->RemoveItem(0);
- BMenuItem* item1 = m_settingsMenu->RemoveItem(0);
- BMenuItem* item2 = m_settingsMenu->RemoveItem(0);
+ BMenuItem* item0 = m_settingsMenu->RemoveItem((int32)0);
+ BMenuItem* item1 = m_settingsMenu->RemoveItem((int32)0);
+ BMenuItem* item2 = m_settingsMenu->RemoveItem((int32)0);
m_settingsMenu->Archive(&settingsMsg, true);
diff --git a/Source/Beezer/BeezerListView.cpp b/Source/Beezer/BeezerListView.cpp
index 0dcfe43..6ea66c0 100644
--- a/Source/Beezer/BeezerListView.cpp
+++ b/Source/Beezer/BeezerListView.cpp
@@ -80,7 +80,7 @@ BeezerListView::~BeezerListView()
// Delete all list items here as CLV doesn't do it for us in its destructor
int32 itemCount = FullListCountItems();
for (int32 i = 0; i < itemCount; i++)
- delete(ListEntry*)ColumnListView::RemoveItem(0);
+ delete(ListEntry*)ColumnListView::RemoveItem((int32)0);
}
diff --git a/Source/Beezer/MainWindow.cpp b/Source/Beezer/MainWindow.cpp
index 38088b0..be2d728 100644
--- a/Source/Beezer/MainWindow.cpp
+++ b/Source/Beezer/MainWindow.cpp
@@ -1506,7 +1506,7 @@ void MainWindow::MessageReceived(BMessage* message)
break;
}
- case M_LOG_CONTEXT_CLEAR: m_logTextView->SetText(NULL, 0); break;
+ case M_LOG_CONTEXT_CLEAR: m_logTextView->SetText(NULL, (int32)0); break;
default:
BWindow::MessageReceived(message);
@@ -3646,9 +3646,9 @@ void MainWindow::SaveArchiverToArchive(BMessage* message)
BMessage msg('arkv');
// Remove "Save as default" "save to archive" and separator items
- BMenuItem* item0 = settingsMenu->RemoveItem(0);
- BMenuItem* item1 = settingsMenu->RemoveItem(0);
- BMenuItem* item2 = settingsMenu->RemoveItem(0);
+ BMenuItem* item0 = settingsMenu->RemoveItem((int32)0);
+ BMenuItem* item1 = settingsMenu->RemoveItem((int32)0);
+ BMenuItem* item2 = settingsMenu->RemoveItem((int32)0);
// If no "message" is passed save the current archiver menu
if (!message)
@@ -4240,7 +4240,7 @@ void MainWindow::EmptyListViewIfNeeded()
{
int32 count = m_listView->FullListCountItems();
for (int32 i = 0; i < count; i++)
- delete m_listView->RemoveItem(0);
+ delete m_listView->RemoveItem((int32)0);
}
}
diff --git a/Source/Beezer/RecentMgr.cpp b/Source/Beezer/RecentMgr.cpp
index 63dde21..e13a32b 100644
--- a/Source/Beezer/RecentMgr.cpp
+++ b/Source/Beezer/RecentMgr.cpp
@@ -66,7 +66,7 @@ RecentMgr::~RecentMgr()
SavePrefs();
for (int32 i = 0; i < m_paths.CountItems(); i++)
- free((char*)m_paths.RemoveItem(0));
+ free((char*)m_paths.RemoveItem((int32)0));
}
diff --git a/Source/PipeMgr/PipeMgr.cpp b/Source/PipeMgr/PipeMgr.cpp
index ad8b326..3a02813 100644
--- a/Source/PipeMgr/PipeMgr.cpp
+++ b/Source/PipeMgr/PipeMgr.cpp
@@ -55,7 +55,7 @@ void PipeMgr::FlushArgs()
{
int32 count = m_argList.CountItems();
for (int32 i = 0; i < count; i++)
- free(m_argList.RemoveItem(0));
+ free(m_argList.RemoveItem((int32)0));
m_argList.MakeEmpty();
}
--
2.26.0