mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
sum_it: switch source to fork by X547 for 64 bit fixes (#10162)
This commit is contained in:
@@ -1,22 +1,22 @@
|
||||
From 452e0845a566b688dce7f48726ca4a1dcfba5014 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Sun, 17 Oct 2021 15:13:12 +0300
|
||||
Subject: fix build
|
||||
From 7a4f5346b6836088818e1ea17101b09c3170119e Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Wed, 28 Feb 2024 22:40:36 -0700
|
||||
Subject: gcc2 fix
|
||||
|
||||
|
||||
diff --git a/rez/Build/Makefile.main b/rez/Build/Makefile.main
|
||||
index 4ba6a0b..34626c0 100644
|
||||
--- a/rez/Build/Makefile.main
|
||||
+++ b/rez/Build/Makefile.main
|
||||
@@ -177,7 +177,7 @@ FORCE:
|
||||
|
||||
Source/rez_parser.cpp rez_parser.cpp: Source/rez_parser.y
|
||||
bison -d -o Source/rez_parser.cpp $<
|
||||
- mv -f Source/rez_parser.hpp Source/rez_parser.cpp.h
|
||||
+ cp Source/rez_parser.hpp Source/rez_parser.cpp.h
|
||||
|
||||
Source/rez_scanner.cpp rez_scanner.cpp: Source/rez_scanner.l
|
||||
flex -i -oSource/rez_scanner.cpp $<
|
||||
diff --git a/sum-it/Source/main/Cell-UI/CellView.drag.cpp b/sum-it/Source/main/Cell-UI/CellView.drag.cpp
|
||||
index 45fe00e..02ed660 100644
|
||||
--- a/sum-it/Source/main/Cell-UI/CellView.drag.cpp
|
||||
+++ b/sum-it/Source/main/Cell-UI/CellView.drag.cpp
|
||||
@@ -184,7 +184,7 @@ void CCellView::MouseMoved(BPoint point, uint32 transit, const BMessage *message
|
||||
{
|
||||
if (fCurrentCursor != curPlus)
|
||||
{
|
||||
- be_app->SetCursor(gResourceManager.LoadCursor(0));
|
||||
+ be_app->SetCursor(gResourceManager.LoadCursor((int32)0));
|
||||
fCurrentCursor = curPlus;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.30.2
|
||||
2.43.2
|
||||
|
||||
|
||||
@@ -6,10 +6,11 @@ HOMEPAGE="https://github.com/beos-zealot/OpenSumIt"
|
||||
COPYRIGHT="1996-1998, 2000 Hekkelman Programmatuur B.V.
|
||||
1999-2000 Tim Vernum"
|
||||
LICENSE="BSD (4-clause)"
|
||||
REVISION="7"
|
||||
SOURCE_URI="https://github.com/keegnotrub/OpenSumIt/archive/b1e8e03.tar.gz"
|
||||
CHECKSUM_SHA256="26172732a28e86bfad3d2c42412d45d42c5ba73213ae5947d6dcaa73e330015a"
|
||||
SOURCE_DIR="OpenSumIt-b1e8e03102690486f92c9fb0b06084bd8d556e88"
|
||||
REVISION="8"
|
||||
srcGitRev="765dc7077bf03c7448fcdd708e7ce43b5f1f0f71"
|
||||
SOURCE_URI="https://github.com/X547/OpenSumIt/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="897c0455a63aae78e509bc79783ad7bac310a47ca080b8d3dddcd9f7e2493413"
|
||||
SOURCE_DIR="OpenSumIt-$srcGitRev"
|
||||
PATCHES="sum_it-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
@@ -26,10 +27,9 @@ BUILD_REQUIRES="
|
||||
haiku_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:bison
|
||||
cmd:flex
|
||||
cmd:gcc
|
||||
cmd:make
|
||||
cmd:rez
|
||||
"
|
||||
|
||||
BUILD()
|
||||
@@ -39,14 +39,11 @@ BUILD()
|
||||
PATH=`pwd`:$PATH
|
||||
popd
|
||||
|
||||
pushd rez
|
||||
make || true # first pass fail for unknown reason
|
||||
make
|
||||
PATH=`pwd`:$PATH
|
||||
pushd sum-it/Resources
|
||||
rc sum-it-types.rdef
|
||||
popd
|
||||
|
||||
cd sum-it
|
||||
make
|
||||
make -C sum-it
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
|
||||
Reference in New Issue
Block a user