mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
yab: build on x86_64.
* remove the fixed haiku revision on REQUIRES, this is dependent on the build system.
This commit is contained in:
114
dev-lang/yab/patches/yab-1.7.5.3.patchset
Normal file
114
dev-lang/yab/patches/yab-1.7.5.3.patchset
Normal file
@@ -0,0 +1,114 @@
|
||||
From e39d3688a3a3b2b3c731912f4d7ac98df526924b Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 30 Jan 2017 19:28:47 +0100
|
||||
Subject: x86_64 build fix
|
||||
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 5e2aafd..16892ae 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -21,7 +21,7 @@ HAIKUOPT = -DHAIKU -DLIBRARY_PATH=\"`finddir B_USER_SETTINGS_DIRECTORY`/yab\"
|
||||
##
|
||||
## Find haiku systenm archetecture from the package file name
|
||||
##
|
||||
-SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86|cut --fields=4 -d-|cut -d. --fields 1)
|
||||
+SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86*|cut --fields=4 -d-|cut -d. --fields 1)
|
||||
#
|
||||
|
||||
##
|
||||
@@ -74,6 +74,9 @@ ifeq ($(USEDARCH), x86)
|
||||
else
|
||||
LD = ld
|
||||
endif
|
||||
+ifeq ($(SYSTEMARCH),x86_64)
|
||||
+ LD=gcc
|
||||
+endif
|
||||
#
|
||||
|
||||
LD_OPT = -shared
|
||||
@@ -178,4 +181,4 @@ install: yab $(YABLIBRARY)
|
||||
cp -f yab /boot/system/non-packaged/bin$(ARCHADD)/
|
||||
cp -f $(YABLIBRARY) /boot/system/non-packaged/lib$(ARCHADD)/
|
||||
cp -f $(YABLIBRARY) /boot/system/non-packaged/develop/lib$(ARCHADD)/
|
||||
-
|
||||
\ No newline at end of file
|
||||
+
|
||||
diff --git a/src/YabInterface.cpp b/src/YabInterface.cpp
|
||||
index 5cf2e2c..affdc14 100644
|
||||
--- a/src/YabInterface.cpp
|
||||
+++ b/src/YabInterface.cpp
|
||||
@@ -123,7 +123,7 @@ int32 interpreter(void *data)
|
||||
char **argv;
|
||||
YabInterface *yab;
|
||||
BList *myData = (BList*)data;
|
||||
- argc = (int)myData->ItemAt(0);
|
||||
+ argc = (int)(addr_t)myData->ItemAt(0);
|
||||
argv = (char**)myData->ItemAt(1);
|
||||
yab = (YabInterface*)myData->ItemAt(2);
|
||||
|
||||
@@ -160,7 +160,7 @@ YabInterface::YabInterface(int argc, char **argv, const char* signature)
|
||||
localMessage = "";
|
||||
|
||||
BList *myData = new BList(3);
|
||||
- myData->AddItem((void*)argc);
|
||||
+ myData->AddItem((void*)(addr_t)argc);
|
||||
myData->AddItem((void*)argv);
|
||||
myData->AddItem((void*)this);
|
||||
myThread = spawn_thread(interpreter,"YabInterpreter",B_NORMAL_PRIORITY,(void*)myData);
|
||||
@@ -6431,7 +6431,7 @@ void YabInterface::PrinterConfig(const char* config)
|
||||
const char* YabInterface::ClipboardPaste()
|
||||
{
|
||||
const char *text;
|
||||
- int32 textlen;
|
||||
+ ssize_t textlen;
|
||||
BString returnstring;
|
||||
BMessage *clip = (BMessage *)NULL;
|
||||
|
||||
diff --git a/src/YabList.cpp b/src/YabList.cpp
|
||||
index cc2e95c..72b31fa 100644
|
||||
--- a/src/YabList.cpp
|
||||
+++ b/src/YabList.cpp
|
||||
@@ -38,7 +38,7 @@ void YabList::AddView(const char* id, const BView* view, int type)
|
||||
{
|
||||
idList->AddItem((void*)new BString(id));
|
||||
viewList->AddItem((void*)view);
|
||||
- typeList->AddItem((void*)type);
|
||||
+ typeList->AddItem((void*)(addr_t)type);
|
||||
}
|
||||
|
||||
void YabList::DelView(const char* id)
|
||||
@@ -70,7 +70,7 @@ const void* YabList::GetView(const char* id)
|
||||
|
||||
const int YabList::GetType(const char* id)
|
||||
{
|
||||
- return (int)typeList->ItemAt(ViewNum(id));
|
||||
+ return (int)(addr_t)typeList->ItemAt(ViewNum(id));
|
||||
}
|
||||
|
||||
const int YabList::CountItems()
|
||||
diff --git a/src/column/ColumnListView.cpp b/src/column/ColumnListView.cpp
|
||||
index 150e3c4..2b997ce 100644
|
||||
--- a/src/column/ColumnListView.cpp
|
||||
+++ b/src/column/ColumnListView.cpp
|
||||
@@ -502,7 +502,7 @@ BRow::BRow(float height)
|
||||
BRow::~BRow()
|
||||
{
|
||||
while (true) {
|
||||
- BField* field = (BField*) fFields.RemoveItem(0L);
|
||||
+ BField* field = (BField*) fFields.RemoveItem((int32)0);
|
||||
if (field == 0)
|
||||
break;
|
||||
|
||||
@@ -798,7 +798,7 @@ BColumnListView::BColumnListView(const char* name, uint32 flags,
|
||||
|
||||
BColumnListView::~BColumnListView()
|
||||
{
|
||||
- while (BColumn* column = (BColumn*)fColumns.RemoveItem(0L))
|
||||
+ while (BColumn* column = (BColumn*)fColumns.RemoveItem((int32)0))
|
||||
delete column;
|
||||
}
|
||||
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -6,12 +6,13 @@ COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
|
||||
2006-2009 Jan Bungeroth (yab improvements)
|
||||
2013-2016 Jim Saxton (yab improvements)"
|
||||
LICENSE="Artistic"
|
||||
REVISION="3"
|
||||
REVISION="4"
|
||||
SOURCE_URI="https://github.com/bbjimmy/YAB/archive/1.7.5.3b.tar.gz"
|
||||
CHECKSUM_SHA256="e828af53955055954edde507177d2cd2603159ae74bfdea2399de974845a12d5"
|
||||
SOURCE_DIR="YAB-1.7.5.3b"
|
||||
PATCHES="yab-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 !x86 ?x86_64"
|
||||
ARCHITECTURES="x86_gcc2 !x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
|
||||
|
||||
PROVIDES="
|
||||
@@ -21,7 +22,7 @@ PROVIDES="
|
||||
devel:libyab = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix >= r1~alpha4_pm_hrev49976
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
|
||||
Reference in New Issue
Block a user