mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-15 00:00:07 +02:00
129 lines
4.7 KiB
Plaintext
129 lines
4.7 KiB
Plaintext
From a6d790e41451ef275932775569c31784e46feb5c Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Mon, 13 Apr 2015 15:08:26 +0300
|
|
Subject: Fix stdc++ in Jamfiles
|
|
|
|
|
|
diff --git a/Jamfile-vncpasswd b/Jamfile-vncpasswd
|
|
index e3e895e..04159e4 100644
|
|
--- a/Jamfile-vncpasswd
|
|
+++ b/Jamfile-vncpasswd
|
|
@@ -53,7 +53,7 @@ RSRCS = beosserver/vncpasswd.rsrc ;
|
|
# Note that libnetwork.so in Haiku is called libnet.so in BeOS, so make a symbolic link
|
|
# in /boot/develop/lib/x86/ to give it both names when compiling under BeOS. Same
|
|
# for libstdc++.r4.so and libstdc++.so being the same.
|
|
-LIBS = be root stdc++ ;
|
|
+LIBS = be root $(STDCPPLIBS) ;
|
|
|
|
# Specify additional paths to directories following the standard
|
|
# libXXX.so or libXXX.a naming scheme. You can specify full paths
|
|
diff --git a/Jamfile-vncserver b/Jamfile-vncserver
|
|
index 04c5bdf..965ea68 100644
|
|
--- a/Jamfile-vncserver
|
|
+++ b/Jamfile-vncserver
|
|
@@ -116,7 +116,7 @@ RSRCS = beosserver/VNCServer.rsrc ;
|
|
# Note that libnetwork.so in Haiku is called libnet.so in BeOS, so make a symbolic link
|
|
# in /boot/develop/lib/x86/ to give it both names when compiling under BeOS. Same
|
|
# for libstdc++.r4.so and libstdc++.so being the same.
|
|
-LIBS = be root network game z stdc++ ;
|
|
+LIBS = be root network game z $(STDCPPLIBS) ;
|
|
|
|
# Specify additional paths to directories following the standard
|
|
# libXXX.so or libXXX.a naming scheme. You can specify full paths
|
|
--
|
|
2.10.2
|
|
|
|
|
|
From 11b25e662cb44a715df56dd3e1a5a2ea48520cec Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sun, 29 Jan 2017 13:58:42 +0100
|
|
Subject: x86_64 build fix.
|
|
|
|
|
|
diff --git a/Jamfile-engine b/Jamfile-engine
|
|
index dc5cfaf..4287669 100644
|
|
--- a/Jamfile-engine
|
|
+++ b/Jamfile-engine
|
|
@@ -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/beosserver/FrameBufferBeOS.cxx b/beosserver/FrameBufferBeOS.cxx
|
|
index 2c1be83..0902b10 100644
|
|
--- a/beosserver/FrameBufferBeOS.cxx
|
|
+++ b/beosserver/FrameBufferBeOS.cxx
|
|
@@ -757,8 +757,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);
|
|
@@ -988,8 +988,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 466c094..0e86ceb 100644
|
|
--- a/beosserver/InputEventInjector.cpp
|
|
+++ b/beosserver/InputEventInjector.cpp
|
|
@@ -122,7 +122,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;
|
|
@@ -133,7 +133,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;
|
|
@@ -150,7 +150,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 dcceb3a..f90cc89 100644
|
|
--- a/beosserver/ServerMain.cxx
|
|
+++ b/beosserver/ServerMain.cxx
|
|
@@ -307,7 +307,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.10.2
|
|
|