haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

vncserver: bump version to 1.30 (#3305)

Browse Source
This commit is contained in:
Calvin Hill
2018-10-31 01:02:19 +00:00
committed by fbrosson
parent d6e0c49c33
commit 77ccdf7095
2 changed files with 15 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
haiku-apps/vncserver/patches/vncserver-1.27.patchset → haiku-apps/vncserver/patches/vncserver-1.30.patchset
View File

@@ -1,43 +1,8 @@
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.
From 85805eabaf26351096a230bfc2a0f424ca535c62 Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Wed, 31 Oct 2018 00:07:57 +0000
Subject: Update patches to fix stdc++ in Jamfiles and x86_64 support by diver
and korli
diff --git a/Jamfile-engine b/Jamfile-engine
@@ -80,10 +45,10 @@ index 2c1be83..0902b10 100644
sizeof (TempString) - strlen (TempString));
vlog.debug (TempString);
diff --git a/beosserver/InputEventInjector.cpp b/beosserver/InputEventInjector.cpp
index 466c094..0e86ceb 100644
index f1d48a7..e24b09e 100644
--- a/beosserver/InputEventInjector.cpp
+++ b/beosserver/InputEventInjector.cpp
@@ -122,7 +122,7 @@ status_t InputEventInjector::InitCheck ()
@@ -125,7 +125,7 @@ status_t InputEventInjector::InitCheck ()
status_t InputEventInjector::Start (const char *device, void *cookie)
{
@@ -92,7 +57,7 @@ index 466c094..0e86ceb 100644
m_KeyboardEnabled = true;
else
return B_ERROR;
@@ -133,7 +133,7 @@ status_t InputEventInjector::Start (const char *device, void *cookie)
@@ -136,7 +136,7 @@ status_t InputEventInjector::Start (const char *device, void *cookie)
status_t InputEventInjector::Stop (const char *device, void *cookie)
{
@@ -101,7 +66,7 @@ index 466c094..0e86ceb 100644
m_KeyboardEnabled = false;
else
return B_ERROR;
@@ -150,7 +150,7 @@ status_t InputEventInjector::Control (
@@ -153,7 +153,7 @@ status_t InputEventInjector::Control (
{
BMessage *EventMsgPntr = NULL;
@@ -111,10 +76,10 @@ index 466c094..0e86ceb 100644
if (m_KeyboardEnabled && code == 'EInj' && message != NULL)
{
diff --git a/beosserver/ServerMain.cxx b/beosserver/ServerMain.cxx
index dcceb3a..f90cc89 100644
index 1e4e193..fdba6a2 100644
--- a/beosserver/ServerMain.cxx
+++ b/beosserver/ServerMain.cxx
@@ -307,7 +307,7 @@ void ServerApp::MessageReceived (BMessage *MessagePntr)
@@ -318,7 +318,7 @@ void ServerApp::MessageReceived (BMessage *MessagePntr)
else if (MessagePntr->what == B_CLIPBOARD_CHANGED)
{
BMessage *ClipMsgPntr;
@@ -124,5 +89,5 @@ index dcceb3a..f90cc89 100644
if (m_VNCServerPntr != NULL && be_clipboard->Lock())
--
2.10.2
2.19.1

6
haiku-apps/vncserver/vncserver-1.27.recipe → haiku-apps/vncserver/vncserver-1.30.recipe
View File

@@ -22,9 +22,9 @@ System)
1996 Widget Workshop, Inc, by Dave Zimmerman, Jef Poskanzer (Java DES \
software)"
LICENSE="GNU GPL v2"
REVISION="3"
SOURCE_URI="http://www.agmsmith.ca/BeOS/VNCServer-4.0-BeOS-AGMS-$portVersion.zip"
CHECKSUM_SHA256="ec55f781ee375f4a325faa008336394d675dcf795d8b165d669f456ba220e27a"
REVISION="1"
SOURCE_URI="https://www.agmsmith.ca/BeOS/VNCServer-4.0-BeOS-AGMS-$portVersion.zip"
CHECKSUM_SHA256="8bf85acd60f236ee882542f63041abef1eeb499deade469d228845dc056ad10a"
SOURCE_DIR="VNCServer-4.0-BeOS-AGMS-$portVersion/Source Code"
PATCHES="vncserver-$portVersion.patchset"