mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 14:38:51 +02:00
119 lines
4.0 KiB
Plaintext
119 lines
4.0 KiB
Plaintext
From 153e0ec956cff0c7c0fb3ff02e1e4fb9afc235dc Mon Sep 17 00:00:00 2001
|
|
From: Calvin Hill <calvin@hakobaito.co.uk>
|
|
Date: Tue, 9 Apr 2019 23:29:24 +0300
|
|
Subject: Update patches to fix stdc++ in Jamfiles and x86_64 support by diver
|
|
and korli
|
|
|
|
|
|
diff --git a/Jamfile-engine b/Jamfile-engine
|
|
index dc5cfaf..a7d147d 100644
|
|
--- a/Jamfile-engine
|
|
+++ b/Jamfile-engine
|
|
@@ -315,7 +315,7 @@ if ( $(OSPLAT) = X86 )
|
|
if ( $(WARNINGS) = ALL )
|
|
{
|
|
CCFLAGS += -Wall -Wno-multichar -Wno-ctor-dtor-privacy ;
|
|
- C++FLAGS += -Wall -Wno-multichar -Wno-ctor-dtor-privacy ;
|
|
+ C++FLAGS += -Wall -Wno-multichar ;
|
|
}
|
|
else if ( $(WARNINGS) = NONE )
|
|
{
|
|
@@ -329,7 +329,7 @@ if ( $(OSPLAT) = X86 )
|
|
switch $(TYPE)
|
|
{
|
|
case APP : LINKFLAGS += -Xlinker -soname=_APP_ ;
|
|
- case SHARED : LINKFLAGS += -nostart -Xlinker -soname=$(NAME) ;
|
|
+ case SHARED : LINKFLAGS += -shared -Xlinker -soname=$(NAME) ;
|
|
case DRIVER : LINKFLAGS += -nostdlib /boot/develop/lib/x86/_KERNEL_ ;
|
|
}
|
|
}
|
|
diff --git a/_INPUTSERVER_ b/_INPUTSERVER_
|
|
deleted file mode 100644
|
|
index f405207..0000000
|
|
--- a/_INPUTSERVER_
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-/system/servers/input_server
|
|
\ No newline at end of file
|
|
diff --git a/_INPUTSERVER_ b/_INPUTSERVER_
|
|
new file mode 120000
|
|
index 0000000..f405207
|
|
--- /dev/null
|
|
+++ b/_INPUTSERVER_
|
|
@@ -0,0 +1 @@
|
|
+/system/servers/input_server
|
|
\ No newline at end of file
|
|
diff --git a/beosserver/FrameBufferBeOS.cxx b/beosserver/FrameBufferBeOS.cxx
|
|
index 041d38b..5de5f01 100644
|
|
--- a/beosserver/FrameBufferBeOS.cxx
|
|
+++ b/beosserver/FrameBufferBeOS.cxx
|
|
@@ -777,8 +777,8 @@ unsigned int FrameBufferBDirect::UpdatePixelFormatEtc ()
|
|
char TempString [2048];
|
|
sprintf (TempString,
|
|
"UpdatePixelFormatEtc new settings: "
|
|
- "Width=%d, Stride=%d, Height=%d, Bits at $%08X, ",
|
|
- width_, m_CachedStride, height_, (unsigned int) data);
|
|
+ "Width=%d, Stride=%d, Height=%d, Bits at $%p, ",
|
|
+ width_, m_CachedStride, height_, data);
|
|
format.print (TempString + strlen (TempString),
|
|
sizeof (TempString) - strlen (TempString));
|
|
vlog.debug (TempString);
|
|
@@ -1018,8 +1018,8 @@ unsigned int FrameBufferBScreen::UpdatePixelFormatEtc ()
|
|
char TempString [2048];
|
|
sprintf (TempString,
|
|
"UpdatePixelFormatEtc new settings: "
|
|
- "Width=%d, Stride=%d, Height=%d, Bits at $%08X, ",
|
|
- width_, m_CachedStride, height_, (unsigned int) data);
|
|
+ "Width=%d, Stride=%d, Height=%d, Bits at $%p, ",
|
|
+ width_, m_CachedStride, height_, data);
|
|
format.print (TempString + strlen (TempString),
|
|
sizeof (TempString) - strlen (TempString));
|
|
vlog.debug (TempString);
|
|
diff --git a/beosserver/InputEventInjector.cpp b/beosserver/InputEventInjector.cpp
|
|
index f1d48a7..e24b09e 100644
|
|
--- a/beosserver/InputEventInjector.cpp
|
|
+++ b/beosserver/InputEventInjector.cpp
|
|
@@ -125,7 +125,7 @@ status_t InputEventInjector::InitCheck ()
|
|
|
|
status_t InputEventInjector::Start (const char *device, void *cookie)
|
|
{
|
|
- if ((int) cookie == 76543210)
|
|
+ if ((addr_t) cookie == 76543210)
|
|
m_KeyboardEnabled = true;
|
|
else
|
|
return B_ERROR;
|
|
@@ -136,7 +136,7 @@ status_t InputEventInjector::Start (const char *device, void *cookie)
|
|
|
|
status_t InputEventInjector::Stop (const char *device, void *cookie)
|
|
{
|
|
- if ((int) cookie == 76543210)
|
|
+ if ((addr_t) cookie == 76543210)
|
|
m_KeyboardEnabled = false;
|
|
else
|
|
return B_ERROR;
|
|
@@ -153,7 +153,7 @@ status_t InputEventInjector::Control (
|
|
{
|
|
BMessage *EventMsgPntr = NULL;
|
|
|
|
- if ((int) cookie == 76543210)
|
|
+ if ((addr_t) cookie == 76543210)
|
|
{
|
|
if (m_KeyboardEnabled && code == 'EInj' && message != NULL)
|
|
{
|
|
diff --git a/beosserver/ServerMain.cxx b/beosserver/ServerMain.cxx
|
|
index 97cbe49..86c42b1 100644
|
|
--- a/beosserver/ServerMain.cxx
|
|
+++ b/beosserver/ServerMain.cxx
|
|
@@ -324,7 +324,7 @@ void ServerApp::MessageReceived (BMessage *MessagePntr)
|
|
else if (MessagePntr->what == B_CLIPBOARD_CHANGED)
|
|
{
|
|
BMessage *ClipMsgPntr;
|
|
- int32 TextLength;
|
|
+ ssize_t TextLength;
|
|
const char *TextPntr;
|
|
|
|
if (m_VNCServerPntr != NULL && be_clipboard->Lock())
|
|
--
|
|
2.21.0
|
|
|