mirror of
https://git.freebsd.org/ports.git
synced 2025-05-01 19:16:39 -04:00
f41ed7ed22
1. If net/gtk-vnc build with PULSEAUDIO off and GVNC option is on then remmina-plugin-gvnc.so plugin doesn't build and stage of the net/remmina fails: pkg-static: Unable to access file /usr/ports/net/remmina/work-default/stage/usr/local/lib/remmina/plugins/remmina-plugin-gvnc.so:No such file or directory pkg-static: Unable to access file /usr/ports/net/remmina/work-default/stage/usr/local/share/icons/hicolor/scalable/emblems/org.remmina.Remmina-gvnc-symbolic.svg:No such file or directory 2. Port have 2 options with same name GVNC. 3. Options GVNC and VNC are mixed up. 4. Removed unnecessary dependencies (from atk, pcre, jpeg, harfbuzz, gnutls, xkbfile and etc). 5. Moved dependency from libsoup to WWW only. 6. Replaced dependency from libfreerdp2.so (not linked) with libfreerdp-client2.so and libwinpr2.so.2 (linked). Reviewed by: fernape (maintainer) Approved by: fernape (maintainer), arrowd (mentor), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D44152
66 lines
2.1 KiB
Text
66 lines
2.1 KiB
Text
--- cmake/FindGTK-VNC.cmake.orig 2024-02-23 14:29:23 UTC
|
|
+++ cmake/FindGTK-VNC.cmake
|
|
@@ -60,8 +60,8 @@ find_library(GTK-VNC_LIB gtk-vnc-2.0
|
|
${COMMON_LIB_DIR}
|
|
)
|
|
|
|
-if(GVNC_LIB AND GVNCPULSE_LIB AND GTK-VNC_LIB)
|
|
- set(GTK-VNC_LIBRARIES ${GVNC_LIB} ${GVNCPULSE_LIB} ${GTK-VNC_LIB})
|
|
+if(GVNC_LIB AND GTK-VNC_LIB)
|
|
+ set(GTK-VNC_LIBRARIES ${GVNC_LIB} ${GTK-VNC_LIB})
|
|
message(STATUS "GTK-VNC-Libs: ${GTK-VNC_LIBRARIES}")
|
|
endif()
|
|
|
|
@@ -86,8 +86,8 @@ find_path(GTK-VNC_INCLUDE_DIR gtk-vnc.h
|
|
${COMMON_INCLUDE_DIR}
|
|
)
|
|
|
|
-if(GVNC_INCLUDE_DIR AND GVNCPULSE_INCLUDE_DIR AND GTK-VNC_INCLUDE_DIR)
|
|
- set(GTK-VNC_INCLUDE_DIRS ${GVNC_INCLUDE_DIR} ${GVNCPULSE_INCLUDE_DIR} ${GTK-VNC_INCLUDE_DIR})
|
|
+if(GVNC_INCLUDE_DIR AND GTK-VNC_INCLUDE_DIR)
|
|
+ set(GTK-VNC_INCLUDE_DIRS ${GVNC_INCLUDE_DIR} ${GTK-VNC_INCLUDE_DIR})
|
|
message(STATUS "GTK-VNC-Include-Dirs: ${GTK-VNC_INCLUDE_DIRS}")
|
|
endif()
|
|
|
|
--- plugins/gvnc/gvnc_plugin.c.orig 2024-02-23 14:29:23 UTC
|
|
+++ plugins/gvnc/gvnc_plugin.c
|
|
@@ -37,7 +37,7 @@
|
|
|
|
#include <vncdisplay.h>
|
|
#include <vncutil.h>
|
|
-#include <vncaudiopulse.h>
|
|
+//#include <vncaudiopulse.h>
|
|
|
|
#define GVNC_DEFAULT_PORT 5900
|
|
|
|
@@ -700,8 +700,8 @@ static void gvnc_plugin_init(RemminaProtocolWidget *gp
|
|
vnc_util_set_debug(TRUE);
|
|
|
|
gpdata->vnc = vnc_display_new();
|
|
- if (remmina_plugin_service->file_get_int(remminafile, "enableaudio", FALSE))
|
|
- gpdata->pa = vnc_audio_pulse_new();
|
|
+// if (remmina_plugin_service->file_get_int(remminafile, "enableaudio", FALSE))
|
|
+// gpdata->pa = vnc_audio_pulse_new();
|
|
|
|
|
|
g_signal_connect(gpdata->vnc, "vnc-auth-credential",
|
|
--- plugins/gvnc/gvnc_plugin.h.orig 2024-02-28 20:33:54 UTC
|
|
+++ plugins/gvnc/gvnc_plugin.h
|
|
@@ -37,7 +37,7 @@
|
|
#include <gdk/gdkkeysyms.h>
|
|
#include <vncdisplay.h>
|
|
#include <vncutil.h>
|
|
-#include <vncaudiopulse.h>
|
|
+//#include <vncaudiopulse.h>
|
|
|
|
|
|
#ifndef GDK_Return
|
|
@@ -113,7 +113,7 @@ typedef struct _GVncPluginData {
|
|
GtkWidget * box;
|
|
GtkWidget * vnc;
|
|
VncConnection * conn;
|
|
- VncAudioPulse * pa;
|
|
+ /*VncAudioPulse*/ void * pa;
|
|
gchar * error_msg;
|
|
gchar * clipstr;
|
|
gulong signal_clipboard;
|