Update to remmina-1.4.23.
This commit is contained in:
ajacoutot
parent
8368d58199
commit
06099033fb
|
|
@ -1,11 +1,10 @@
|
|||
# $OpenBSD: Makefile,v 1.52 2021/11/15 19:40:17 rsadowski Exp $
|
||||
# $OpenBSD: Makefile,v 1.53 2022/01/13 16:00:06 ajacoutot Exp $
|
||||
|
||||
COMMENT= GTK+ remote desktop client
|
||||
|
||||
V= 1.4.13
|
||||
V= 1.4.23
|
||||
DISTNAME= remmina-${V}
|
||||
WRKDIST= ${WRKDIR}/Remmina-v${V}-bd1be9d309b420234961b6dd5d2c6364f4a08e49
|
||||
REVISION= 1
|
||||
WRKDIST= ${WRKDIR}/Remmina-v${V}-a03c1648a090458736434c77c0be00a7cf9cc44b
|
||||
|
||||
CATEGORIES= x11 net
|
||||
|
||||
|
|
@ -18,8 +17,8 @@ WANTLIB += ICE SM X11 Xext avahi-client avahi-common avahi-ui-gtk3
|
|||
WANTLIB += c cairo crypto cups freerdp-client2 freerdp2 gcrypt
|
||||
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
|
||||
WANTLIB += gtk-3 intl json-glib-1.0 pango-1.0 pthread secret-1
|
||||
WANTLIB += sodium soup-2.4 spice-client-gtk-3.0 ssh ssl vncclient
|
||||
WANTLIB += vte-2.91 winpr2 xkbfile spice-client-glib-2.0
|
||||
WANTLIB += sodium soup-2.4 spice-client-glib-2.0 spice-client-gtk-3.0
|
||||
WANTLIB += ssh ssl vncclient vte-2.91 winpr2
|
||||
|
||||
MASTER_SITES= https://gitlab.com/Remmina/Remmina/-/archive/v${V}/
|
||||
|
||||
|
|
@ -48,7 +47,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
|
|||
x11/gtk+3,-guic
|
||||
|
||||
# Appindicator is only used by Ubuntu's Unity.
|
||||
CONFIGURE_ARGS += -DWITH_APPINDICATOR=OFF \
|
||||
CONFIGURE_ARGS += -DHAVE_LIBAPPINDICATOR=OFF \
|
||||
-DWITH_ICON_CACHE=OFF \
|
||||
-DWITH_UPDATE_DESKTOP_DB=OFF \
|
||||
-DCMAKE_C_FLAGS="-I${X11BASE}/include -I${LOCALBASE}/include ${CFLAGS}"
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (remmina-1.4.13.tar.gz) = qvRTqW+DVfKD2qNmPZr5FzFJJWQnf+5zNHzrY3Sitwc=
|
||||
SIZE (remmina-1.4.13.tar.gz) = 2523009
|
||||
SHA256 (remmina-1.4.23.tar.gz) = KPNisrYhKcwnmeRGqPaHwIFvDS9zrFA78BvBVlQNXEU=
|
||||
SIZE (remmina-1.4.23.tar.gz) = 3282988
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
$OpenBSD: patch-CMakeLists_txt,v 1.9 2021/11/15 19:40:17 rsadowski Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.10 2022/01/13 16:00:06 ajacoutot Exp $
|
||||
|
||||
- Disable wayland
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -262,9 +262,9 @@ check_include_files(errno.h HAVE_ERRNO_H)
|
||||
@@ -282,9 +282,9 @@ check_include_files(errno.h HAVE_ERRNO_H)
|
||||
include_directories(.)
|
||||
include_directories(src/include)
|
||||
|
||||
|
|
@ -17,15 +17,51 @@ Index: CMakeLists.txt
|
|||
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
|
||||
include_directories(/usr/local/include /usr/include)
|
||||
link_directories(/usr/local/lib /usr/lib)
|
||||
@@ -376,10 +376,7 @@ if(NOT GTK3_FOUND)
|
||||
endif(NOT GTK3_FOUND)
|
||||
@@ -409,36 +409,17 @@ if(NOT GTK3_FOUND)
|
||||
endif()
|
||||
include_directories(${GTK3_INCLUDE_DIRS})
|
||||
|
||||
-pkg_check_modules(wayland-client REQUIRED wayland-client)
|
||||
-if(NOT wayland-client_FOUND)
|
||||
- message(FATAL_ERROR "Wayland library not found")
|
||||
-endif(NOT wayland-client_FOUND)
|
||||
+#pkg_check_modules(wayland-client wayland-client)
|
||||
|
||||
include_directories(${wayland-client_INCLUDE_DIRS})
|
||||
-pkg_check_modules(wayland-client wayland-client)
|
||||
-if(wayland-client_FOUND)
|
||||
- set(GTK_LIBRARIES
|
||||
- ${GTK3_LIBRARY}
|
||||
- ${GDK3_LIBRARY}
|
||||
- ${GDKPixbuf_LIBRARY}
|
||||
- ${Pango_LIBRARY}
|
||||
- ${Cairo_LIBRARY}
|
||||
- ${GObject_LIBRARY}
|
||||
- ${GLib_LIBRARY}
|
||||
- ${GIO_LIBRARY}
|
||||
- ${Gmodule_LIBRARIES}
|
||||
- ${GMODULE_LIBRARY}
|
||||
- ${wayland-client_LIBRARIES})
|
||||
- include_directories(${wayland-client_INCLUDE_DIRS})
|
||||
- message(STATUS "Wayland library found.")
|
||||
-else()
|
||||
- set(GTK_LIBRARIES
|
||||
- ${GTK3_LIBRARY}
|
||||
- ${GDK3_LIBRARY}
|
||||
- ${GDKPixbuf_LIBRARY}
|
||||
- ${Pango_LIBRARY}
|
||||
- ${Cairo_LIBRARY}
|
||||
- ${GObject_LIBRARY}
|
||||
- ${GLib_LIBRARY}
|
||||
- ${GIO_LIBRARY}
|
||||
- ${Gmodule_LIBRARIES}
|
||||
- ${GMODULE_LIBRARY})
|
||||
- message(STATUS "Wayland library not found.")
|
||||
-endif()
|
||||
+set(GTK_LIBRARIES
|
||||
+ ${GTK3_LIBRARY}
|
||||
+ ${GDK3_LIBRARY}
|
||||
+ ${GDKPixbuf_LIBRARY}
|
||||
+ ${Pango_LIBRARY}
|
||||
+ ${Cairo_LIBRARY}
|
||||
+ ${GObject_LIBRARY}
|
||||
+ ${GLib_LIBRARY}
|
||||
+ ${GIO_LIBRARY}
|
||||
+ ${Gmodule_LIBRARIES}
|
||||
+ ${GMODULE_LIBRARY})
|
||||
|
||||
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
|
||||
find_package(Threads REQUIRED)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
$OpenBSD: patch-plugins_vnc_vnc_plugin_c,v 1.3 2021/03/30 20:18:28 sthen Exp $
|
||||
$OpenBSD: patch-plugins_vnc_vnc_plugin_c,v 1.4 2022/01/13 16:00:06 ajacoutot Exp $
|
||||
|
||||
Fix double mutex lock and double free
|
||||
|
||||
Index: plugins/vnc/vnc_plugin.c
|
||||
--- plugins/vnc/vnc_plugin.c.orig
|
||||
+++ plugins/vnc/vnc_plugin.c
|
||||
@@ -110,8 +110,6 @@ static void onMainThread_schedule_callback_and_wait(st
|
||||
@@ -111,8 +111,6 @@ static void onMainThread_schedule_callback_and_wait(st
|
||||
pthread_mutex_lock(&d->mu);
|
||||
gdk_threads_add_idle((GSourceFunc)onMainThread_cb, (gpointer)d);
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ Index: plugins/vnc/vnc_plugin.c
|
|||
pthread_cleanup_pop(0);
|
||||
pthread_mutex_unlock(&d->mu);
|
||||
pthread_mutex_destroy(&d->mu);
|
||||
@@ -235,7 +233,6 @@ static void remmina_plugin_vnc_update_scale(RemminaPro
|
||||
@@ -237,7 +235,6 @@ static void remmina_plugin_vnc_update_scale(RemminaPro
|
||||
d->gp = gp;
|
||||
d->scale = scale;
|
||||
onMainThread_schedule_callback_and_wait(d);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $OpenBSD: PLIST,v 1.14 2021/03/03 18:21:58 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.15 2022/01/13 16:00:06 ajacoutot Exp $
|
||||
@conflict remmina-plugins-*
|
||||
@conflict remmina-plugins-telepathy-*
|
||||
@pkgpath x11/remmina,-rdp
|
||||
|
|
@ -16,90 +16,65 @@ lib/pkgconfig/remmina.pc
|
|||
lib/remmina/
|
||||
lib/remmina/plugins/
|
||||
@so lib/remmina/plugins/remmina-plugin-exec.so
|
||||
@so lib/remmina/plugins/remmina-plugin-nx.so
|
||||
@so lib/remmina/plugins/remmina-plugin-rdp.so
|
||||
@so lib/remmina/plugins/remmina-plugin-secret.so
|
||||
@so lib/remmina/plugins/remmina-plugin-spice.so
|
||||
@so lib/remmina/plugins/remmina-plugin-st.so
|
||||
@so lib/remmina/plugins/remmina-plugin-vnc.so
|
||||
@so lib/remmina/plugins/remmina-plugin-xdmcp.so
|
||||
@man man/man1/remmina-file-wrapper.1
|
||||
@man man/man1/remmina.1
|
||||
share/applications/org.remmina.Remmina-file.desktop
|
||||
share/applications/org.remmina.Remmina.desktop
|
||||
share/applications/remmina-file.desktop
|
||||
share/icons/hicolor/128x128/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/128x128/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/128x128/apps/remmina-panel.png
|
||||
share/icons/hicolor/16x16/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/16x16/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/16x16/apps/remmina-panel.png
|
||||
share/icons/hicolor/16x16/status/org.remmina.Remmina-status.svg
|
||||
share/icons/hicolor/22x22/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/22x22/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/22x22/apps/remmina-panel.png
|
||||
share/icons/hicolor/22x22/status/org.remmina.Remmina-status.svg
|
||||
share/icons/hicolor/24x24/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/24x24/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/24x24/apps/remmina-panel.png
|
||||
share/icons/hicolor/24x24/status/org.remmina.Remmina-status.svg
|
||||
share/icons/hicolor/256x256/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/256x256/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/256x256/apps/remmina-panel.png
|
||||
share/icons/hicolor/32x32/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/32x32/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/32x32/apps/remmina-panel.png
|
||||
share/icons/hicolor/32x32/status/org.remmina.Remmina-status.svg
|
||||
share/icons/hicolor/48x48/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/48x48/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/48x48/apps/remmina-panel.png
|
||||
share/icons/hicolor/48x48/status/org.remmina.Remmina-status.svg
|
||||
share/icons/hicolor/512x512/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/64x64/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/64x64/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/64x64/apps/remmina-panel.png
|
||||
share/icons/hicolor/64x64/status/org.remmina.Remmina-status.svg
|
||||
share/icons/hicolor/72x72/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/72x72/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/72x72/apps/remmina-panel.png
|
||||
share/icons/hicolor/96x96/apps/org.remmina.Remmina.png
|
||||
share/icons/hicolor/96x96/apps/remmina-panel-inverted.png
|
||||
share/icons/hicolor/96x96/apps/remmina-panel.png
|
||||
share/icons/hicolor/apps/
|
||||
share/icons/hicolor/apps/org.remmina.Remmina-symbolic.svg
|
||||
share/icons/hicolor/apps/remmina-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-camera-photo-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-connect-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-disconnect-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-document-save-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-document-send-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-duplicate-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-dynres-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-fit-window-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-fullscreen-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-go-bottom-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-keyboard-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-multi-monitor-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-pan-down-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-pan-up-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-pin-down-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-pin-up-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-preferences-system-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-scale-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-switch-page-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/remmina-system-run-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/view-list.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-camera-photo-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-connect-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-disconnect-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-document-save-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-document-send-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-duplicate-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-dynres-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-fit-window-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-fullscreen-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-go-bottom-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-keyboard-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-multi-monitor-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-pan-down-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-pan-up-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-pin-down-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-pin-up-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-preferences-system-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-scale-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-switch-page-symbolic.svg
|
||||
share/icons/hicolor/scalable/actions/org.remmina.Remmina-system-run-symbolic.svg
|
||||
share/icons/hicolor/scalable/apps/org.remmina.Remmina-symbolic.svg
|
||||
share/icons/hicolor/scalable/apps/org.remmina.Remmina.svg
|
||||
share/icons/hicolor/scalable/apps/remmina-panel-inverted.svg
|
||||
share/icons/hicolor/scalable/apps/remmina-panel.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-nx-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-rdp-ssh-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-rdp-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-sftp-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-spice-ssh-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-spice-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-ssh-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-tool-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-vnc-ssh-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-vnc-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-xdmcp-ssh-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/remmina-xdmcp-symbolic.svg
|
||||
share/icons/hicolor/scalable/panel/
|
||||
share/icons/hicolor/scalable/panel/remmina-panel-inverted.svg
|
||||
share/icons/hicolor/scalable/panel/remmina-panel.svg
|
||||
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-rdp-ssh-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-rdp-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-sftp-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-spice-ssh-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-spice-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-ssh-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-tool-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-vnc-ssh-symbolic.svg
|
||||
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-vnc-symbolic.svg
|
||||
share/locale/ar/LC_MESSAGES/remmina.mo
|
||||
share/locale/ast/LC_MESSAGES/remmina.mo
|
||||
share/locale/ber/
|
||||
|
|
|
|||
Loading…
Reference in New Issue