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

Beam: avoid triggering #6400.

Browse Source
This commit is contained in:
Adrien Destugues
2014-12-23 10:34:49 +01:00
parent fe6045b28b
commit abab702011
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
haiku-apps/beam/beam-1.2alpha.recipe
View File

@@ -1,7 +1,7 @@
SUMMARY="An e-mail client."
HOMEPAGE="http://beam.sourceforge.net"
SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam"
REVISION="3"
REVISION="4"
ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
beam = $portVersion

28
haiku-apps/beam/patches/beam-1.2alpha.patchset
View File

@@ -1,4 +1,4 @@
From 6545d15dfc53594f4141047bf4c84d55cfccda6d Mon Sep 17 00:00:00 2001
From e6115845893578b237144c1660a686802598ff9a Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Thu, 14 Nov 2013 02:12:56 -0700
Subject: Adjust search path for libbnetapi
@@ -20,3 +20,29 @@ index d411b68..4874ac6 100644
--
1.8.3.4
From 63db87fb177e6c1649bf0aad0aa1922af47dd59e Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Tue, 23 Dec 2014 10:18:56 +0100
Subject: Remove leftover unlock.
I can't find any place where the lock would be locked matching this call
to Unlock. Must be an error then.
Triggers #6400 on Haiku.
diff --git a/src-beam/BmGuiRoster.cpp b/src-beam/BmGuiRoster.cpp
index d16e0f1..cd4bf59 100644
--- a/src-beam/BmGuiRoster.cpp
+++ b/src-beam/BmGuiRoster.cpp
@@ -516,7 +516,6 @@ void BmGuiRoster::RebuildLogMenu( BmMenuControllerBase* logMenu) {
}
logMenu->AddItem( smtpMenu);
}
- TheLogHandler->mLocker.Unlock();
}
/*------------------------------------------------------------------------------*\
--
1.8.3.4