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

bong: upstreamed patchset.

Browse Source
This commit is contained in:
Jerome Duval
2018-09-21 08:33:05 +02:00
parent c2e45bcd76
commit bf59e9a190
2 changed files with 3 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
haiku-games/bong/bong-1.4~git.recipe
View File

@@ -4,13 +4,12 @@ Pong"
HOMEPAGE="https://github.com/HaikuArchives/Bong"
COPYRIGHT="1997 by Gertjan van Ratingen"
LICENSE="bong"
REVISION="1"
srcGitRev="906d822b79bdae9328fe743dffe2871f96a30e0e"
REVISION="2"
srcGitRev="0621726ce71909da7f14ea3c91275cb14cf20f80"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="41fab18b900db644e39a08f2d5463e0a367720c21093f492d5d2cfaa8086da0f"
CHECKSUM_SHA256="470aa931d5382b848631456db6e78582057268d1b63a6aa38a5cd27565b23bd7"
SOURCE_FILENAME="bong-$portVersion-$srcGitRev.tar.gz"
SOURCE_DIR="Bong-$srcGitRev"
PATCHES="bong-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"

49
haiku-games/bong/patches/bong-1.4~git.patchset
View File

@@ -1,49 +0,0 @@
From e8b839f39b3c5b3bc2bc502fa120072f1491e71b Mon Sep 17 00:00:00 2001
From: tts2k <tranthaison2000@gmail.com>
Date: Thu, 21 Dec 2017 05:26:23 +0000
Subject: fix for haiku
diff --git a/bong.cpp b/bong.cpp
index 9f4c5c0..4a022a4 100644
--- a/bong.cpp
+++ b/bong.cpp
@@ -1179,7 +1179,7 @@ void bongView::HandlePopupMenu(float x, float y)
BLooper *looper;
BHandler *target = selected->Target(&looper);
if (target == NULL) target = looper->PreferredHandler();
- copy = new BMessage(selected->Message());
+ copy = new BMessage(*(selected->Message()));
looper->PostMessage(copy, target);
delete copy;
selected->SetMarked(TRUE);
--
2.15.0
From 741ad47c8e4e17985f08e2a95ea3b20d022091e3 Mon Sep 17 00:00:00 2001
From: tts2k <tranthaison2000@gmail.com>
Date: Mon, 25 Dec 2017 11:57:04 +0000
Subject: Prevent bong_timer from being deleted twice
diff --git a/bong.cpp b/bong.cpp
index 4a022a4..741166d 100644
--- a/bong.cpp
+++ b/bong.cpp
@@ -502,7 +502,11 @@ bong::~bong()
bool bong::QuitRequested(void)
{
// bong_timer->PostMessage(B_QUIT_REQUESTED);
- bong_timer->Quit();
+ if (bong_timer != NULL) {
+ bong_timer->Lock();
+ bong_timer->Quit();
+ bong_timer = NULL;
+ }
if (BApplication::QuitRequested())
{
return TRUE;
--
2.15.0