Unified
Split
Showing
with
37 additions
and 12 deletions.
- +34 −9 haiku-apps/vncserver/patches/{vncserver-1.30.patchset → vncserver-1.31.patchset}
- +3 −3 haiku-apps/vncserver/{vncserver-1.30.recipe → vncserver-1.31.recipe}
| @@ -1,14 +1,23 @@ | ||
| From 85805eabaf26351096a230bfc2a0f424ca535c62 Mon Sep 17 00:00:00 2001 | ||
| From 153e0ec956cff0c7c0fb3ff02e1e4fb9afc235dc Mon Sep 17 00:00:00 2001 | ||
| From: Calvin Hill <calvin@hakobaito.co.uk> | ||
| Date: Wed, 31 Oct 2018 00:07:57 +0000 | ||
| 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..4287669 100644 | ||
| 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) | ||
| { | ||
| @@ -18,11 +27,27 @@ index dc5cfaf..4287669 100644 | ||
| 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 2c1be83..0902b10 100644 | ||
| index 041d38b..5de5f01 100644 | ||
| --- a/beosserver/FrameBufferBeOS.cxx | ||
| +++ b/beosserver/FrameBufferBeOS.cxx | ||
| @@ -757,8 +757,8 @@ unsigned int FrameBufferBDirect::UpdatePixelFormatEtc () | ||
| @@ -777,8 +777,8 @@ unsigned int FrameBufferBDirect::UpdatePixelFormatEtc () | ||
| char TempString [2048]; | ||
| sprintf (TempString, | ||
| "UpdatePixelFormatEtc new settings: " | ||
| @@ -33,7 +58,7 @@ index 2c1be83..0902b10 100644 | ||
| format.print (TempString + strlen (TempString), | ||
| sizeof (TempString) - strlen (TempString)); | ||
| vlog.debug (TempString); | ||
| @@ -988,8 +988,8 @@ unsigned int FrameBufferBScreen::UpdatePixelFormatEtc () | ||
| @@ -1018,8 +1018,8 @@ unsigned int FrameBufferBScreen::UpdatePixelFormatEtc () | ||
| char TempString [2048]; | ||
| sprintf (TempString, | ||
| "UpdatePixelFormatEtc new settings: " | ||
| @@ -76,10 +101,10 @@ index f1d48a7..e24b09e 100644 | ||
| if (m_KeyboardEnabled && code == 'EInj' && message != NULL) | ||
| { | ||
| diff --git a/beosserver/ServerMain.cxx b/beosserver/ServerMain.cxx | ||
| index 1e4e193..fdba6a2 100644 | ||
| index 97cbe49..86c42b1 100644 | ||
| --- a/beosserver/ServerMain.cxx | ||
| +++ b/beosserver/ServerMain.cxx | ||
| @@ -318,7 +318,7 @@ void ServerApp::MessageReceived (BMessage *MessagePntr) | ||
| @@ -324,7 +324,7 @@ void ServerApp::MessageReceived (BMessage *MessagePntr) | ||
| else if (MessagePntr->what == B_CLIPBOARD_CHANGED) | ||
| { | ||
| BMessage *ClipMsgPntr; | ||
| @@ -89,5 +114,5 @@ index 1e4e193..fdba6a2 100644 | ||
|
|
||
| if (m_VNCServerPntr != NULL && be_clipboard->Lock()) | ||
| -- | ||
| 2.19.1 | ||
| 2.21.0 | ||
|
|
||
| @@ -13,7 +13,7 @@ port). There are lots of VNC clients out there, but I can recommend the \ | ||
| RealVNC ones as working very well under Windows. You can get their clients, \ | ||
| servers and source code at http://www.realvnc.com/" | ||
| HOMEPAGE="http://web.ncf.ca/au829/resume.html#VNCServer" | ||
| COPYRIGHT="2004 by Alexander G. M. Smith | ||
| COPYRIGHT="2004-2019 by Alexander G. M. Smith | ||
| 1988,1989,1990,1991,1992 Richard Outerbridge (Public domain DES software) | ||
| 1987, 1988, 1998 The Open Group and | ||
| 1987, 1988 Digital Equipment Corporation (Software from the X Window \ | ||
| @@ -23,8 +23,8 @@ System) | ||
| software)" | ||
| LICENSE="GNU GPL v2" | ||
| REVISION="1" | ||
| SOURCE_URI="https://www.agmsmith.ca/BeOS/VNCServer-4.0-BeOS-AGMS-$portVersion.zip" | ||
| CHECKSUM_SHA256="8bf85acd60f236ee882542f63041abef1eeb499deade469d228845dc056ad10a" | ||
| SOURCE_URI="http://web.ncf.ca/au829/BeOS/VNCServer-4.0-BeOS-AGMS-$portVersion.zip" | ||
| CHECKSUM_SHA256="731259c2230ebc9d1cf382695130f8613112882c9227e9c68fc87620e7211ddc" | ||
| SOURCE_DIR="VNCServer-4.0-BeOS-AGMS-$portVersion/Source Code" | ||
| PATCHES="vncserver-$portVersion.patchset" | ||
|
|
||