I looked into it, and I guess the www plugin is currently broken (didn't
confirm as I don't use it), as it also has a libsoup2 dependency here,
but libwebkit2gtk is built with libsoup-3.0.
Attached two patches to just exclude the news dialog (to avoid porting
it to libsoup3), switch to libsoup3 and reenable the spice plugin.
Seems to work fine with some light testing.
Thanks,
Andre
From ab5199bac542ca74f0bedb9e0260519521c386d5 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.hei...@gmail.com>
Date: Thu, 4 Aug 2022 09:36:39 +0200
Subject: [PATCH 1/2] don't build the news dialog and switch to libsoup-3.0
---
debian/changelog | 4 +
debian/control | 2 +-
...news-dialog-and-switch-to-libsoup-3..patch | 132 ++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 138 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/0001-don-t-build-the-news-dialog-and-switch-to-libsoup-3..patch
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index a6a32d316..55adbab4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+remmina (1.4.27+dfsg-3) UNRELEASED; urgency=medium
+
+ * don't build the news dialog and switch to libsoup-3.0
+
remmina (1.4.27+dfsg-2) unstable; urgency=medium
[ Jeremy Bicha ]
diff --git a/debian/control b/debian/control
index 16c2de186..43649f628 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
libkf5wallet-dev,
libsecret-1-dev,
libsodium-dev,
- libsoup2.4-dev,
+ libsoup-3.0-dev,
# libspice-client-glib-2.0-dev,
# libspice-client-gtk-3.0-dev,
# libspice-protocol-dev,
diff --git a/debian/patches/0001-don-t-build-the-news-dialog-and-switch-to-libsoup-3..patch b/debian/patches/0001-don-t-build-the-news-dialog-and-switch-to-libsoup-3..patch
new file mode 100644
index 000000000..036b18aa1
--- /dev/null
+++ b/debian/patches/0001-don-t-build-the-news-dialog-and-switch-to-libsoup-3..patch
@@ -0,0 +1,132 @@
+From 328a31a8aeacdbd5bd97acedfba04fb85747a804 Mon Sep 17 00:00:00 2001
+From: Andre Heider <a.hei...@gmail.com>
+Date: Thu, 4 Aug 2022 09:29:00 +0200
+Subject: [PATCH] don't build the news dialog and switch to libsoup-3.0
+
+---
+ ...indLIBSOUP24.cmake => FindLIBSOUP30.cmake} | 24 +++++++++----------
+ plugins/www/CMakeLists.txt | 10 ++++----
+ src/CMakeLists.txt | 10 --------
+ src/remmina.c | 2 +-
+ 4 files changed, 18 insertions(+), 28 deletions(-)
+ rename cmake/{FindLIBSOUP24.cmake => FindLIBSOUP30.cmake} (62%)
+
+diff --git a/cmake/FindLIBSOUP24.cmake b/cmake/FindLIBSOUP30.cmake
+similarity index 62%
+rename from cmake/FindLIBSOUP24.cmake
+rename to cmake/FindLIBSOUP30.cmake
+index 96ec22239..53eca15ca 100644
+--- a/cmake/FindLIBSOUP24.cmake
++++ b/cmake/FindLIBSOUP30.cmake
+@@ -21,26 +21,26 @@
+
+ include(FindPackageHandleStandardArgs)
+
+-pkg_check_modules(PC_LIBSOUP24 libsoup-2.4)
++pkg_check_modules(PC_LIBSOUP30 libsoup-3.0)
+
+
+-find_path(LIBSOUP24_INCLUDE_DIR NAMES libsoup/soup.h
+- HINTS ${PC_LIBSOUP24_INCLUDEDIR} ${PC_LIBSOUP24_INCLUDE_DIRS}
++find_path(LIBSOUP30_INCLUDE_DIR NAMES libsoup/soup.h
++ HINTS ${PC_LIBSOUP30_INCLUDEDIR} ${PC_LIBSOUP30_INCLUDE_DIRS}
+ )
+
+-find_library(LIBSOUP24_LIBRARY
+- NAMES soup-2.4
+- HINTS ${PC_LIBSOUP24_LIBDIR} ${PC_LIBSOUP24_LIBRARY_DIRS}
++find_library(LIBSOUP30_LIBRARY
++ NAMES soup-3.0
++ HINTS ${PC_LIBSOUP30_LIBDIR} ${PC_LIBSOUP30_LIBRARY_DIRS}
+ )
+
+-if (LIBSOUP24_INCLUDE_DIR AND LIBSOUP24_LIBRARY)
+- find_package_handle_standard_args(LIBSOUP24 DEFAULT_MSG LIBSOUP24_LIBRARY LIBSOUP24_INCLUDE_DIR)
++if (LIBSOUP30_INCLUDE_DIR AND LIBSOUP30_LIBRARY)
++ find_package_handle_standard_args(LIBSOUP30 DEFAULT_MSG LIBSOUP30_LIBRARY LIBSOUP30_INCLUDE_DIR)
+ endif()
+
+-if (LIBSOUP24_FOUND)
+- set(LIBSOUP24_LIBRARIES ${LIBSOUP24_LIBRARY})
+- set(LIBSOUP24_INCLUDE_DIRS ${LIBSOUP24_INCLUDE_DIR})
++if (LIBSOUP30_FOUND)
++ set(LIBSOUP30_LIBRARIES ${LIBSOUP30_LIBRARY})
++ set(LIBSOUP30_INCLUDE_DIRS ${LIBSOUP30_INCLUDE_DIR})
+ endif()
+
+-mark_as_advanced(LIBSOUP24_INCLUDE_DIR LIBSOUP24_LIBRARY)
++mark_as_advanced(LIBSOUP30_INCLUDE_DIR LIBSOUP30_LIBRARY)
+
+diff --git a/plugins/www/CMakeLists.txt b/plugins/www/CMakeLists.txt
+index cd1ab3a32..7cddcac5d 100644
+--- a/plugins/www/CMakeLists.txt
++++ b/plugins/www/CMakeLists.txt
+@@ -45,12 +45,12 @@ set_target_properties(remmina-plugin-www PROPERTIES NO_SONAME 1)
+
+ add_definitions(${WEBKIT2GTK_CFLAGS_OTHER})
+
+-find_required_package(LIBSOUP24)
+-if(LIBSOUP24_FOUND)
+- include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${WEBKIT2GTK_INCLUDE_DIRS} ${LIBSOUP24_INCLUDE_DIRS})
+- target_link_libraries(remmina-plugin-www ${REMMINA_COMMON_LIBRARIES} ${LIBSOUP24_LIBRARIES} ${WEBKIT2GTK_LIBRARIES})
++find_required_package(LIBSOUP30)
++if(LIBSOUP30_FOUND)
++ include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${WEBKIT2GTK_INCLUDE_DIRS} ${LIBSOUP30_INCLUDE_DIRS})
++ target_link_libraries(remmina-plugin-www ${REMMINA_COMMON_LIBRARIES} ${LIBSOUP30_LIBRARIES} ${WEBKIT2GTK_LIBRARIES})
+ else()
+- message(FATAL_ERROR "libsoup 2.4 library not found")
++ message(FATAL_ERROR "libsoup 3.0 library not found")
+ endif()
+
+ install(TARGETS remmina-plugin-www DESTINATION ${REMMINA_PLUGINDIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 8d7ddadbb..7e109cb12 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -117,8 +117,6 @@ list(
+ "remmina_sysinfo.c"
+ "rcw.c"
+ "rcw.h"
+- "rmnews.c"
+- "rmnews.h"
+ "remmina_mpchange.c"
+ "remmina_mpchange.h"
+ "remmina_scheduler.c"
+@@ -132,7 +130,6 @@ set(RESOURCE_LIST
+ ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_key_chooser.glade
+ ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_main.glade
+ ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_mpc.glade
+- ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_news.glade
+ ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_passwd.glade
+ ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_preferences.glade
+ ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_search.glade
+@@ -255,13 +252,6 @@ if(GTK3_FOUND)
+ else()
+ message(FATAL_ERROR "json-glib library not found")
+ endif()
+- find_required_package(LIBSOUP24)
+- if(LIBSOUP24_FOUND)
+- include_directories(${LIBSOUP24_INCLUDE_DIRS})
+- target_link_libraries(remmina ${LIBSOUP24_LIBRARIES})
+- else()
+- message(FATAL_ERROR "libsoup 2.4 library not found")
+- endif()
+ endif()
+
+ find_required_package(PCRE2)
+diff --git a/src/remmina.c b/src/remmina.c
+index abc4a3144..7746e0690 100644
+--- a/src/remmina.c
++++ b/src/remmina.c
+@@ -294,7 +294,7 @@ static void remmina_on_startup(GApplication *app)
+ REMMINA_RUNTIME_DATADIR G_DIR_SEPARATOR_S "icons");
+ g_application_hold(app);
+
+- rmnews_schedule();
++ //rmnews_schedule();
+
+ /* Check for secret plugin and service initialization and show console warnings if
+ * something is missing */
+--
+2.35.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..960fb975a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-don-t-build-the-news-dialog-and-switch-to-libsoup-3..patch
--
2.35.1
From 01b49675e03156418ff206f8f914564f40135110 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.hei...@gmail.com>
Date: Thu, 4 Aug 2022 09:38:21 +0200
Subject: [PATCH 2/2] Revert "Temporarily stop building the spice plugin"
This reverts commit 6dc9739815678c3f7ab78bc3c6e0b0e60759e17c.
---
debian/control | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/debian/control b/debian/control
index 43649f628..ff32c4636 100644
--- a/debian/control
+++ b/debian/control
@@ -22,9 +22,9 @@ Build-Depends:
libsecret-1-dev,
libsodium-dev,
libsoup-3.0-dev,
-# libspice-client-glib-2.0-dev,
-# libspice-client-gtk-3.0-dev,
-# libspice-protocol-dev,
+ libspice-client-glib-2.0-dev,
+ libspice-client-gtk-3.0-dev,
+ libspice-protocol-dev,
libssh-dev (>= 0.8.1),
libvncserver-dev,
libvte-2.91-dev,
@@ -53,7 +53,7 @@ Suggests:
remmina-plugin-exec,
remmina-plugin-kwallet,
remmina-plugin-python,
-# remmina-plugin-spice,
+ remmina-plugin-spice,
remmina-plugin-www,
remmina-plugin-x2go
Description: GTK+ Remote Desktop Client
@@ -145,25 +145,25 @@ Description: VNC plugin for Remmina
.
This package contains the VNC plugin for Remmina.
-#Package: remmina-plugin-spice
-#Architecture: any
-#Multi-Arch: same
-#Depends:
-# ${shlibs:Depends},
-# ${misc:Depends},
-# remmina (= ${binary:Version}),
-#Description: Spice plugin for Remmina
-# Remmina is a remote desktop client written in GTK+, aiming to be
-# useful for system administrators and travellers, who need to work
-# with lots of remote computers in front of either large monitors or
-# tiny netbooks.
-# .
-# Remmina supports multiple network protocols in an integrated and
-# consistent user interface.
-# .
-# Currently RDP, VNC, SPICE, WWW, X2Go, EXEC and SSH are supported.
-# .
-# This package contains the Spice plugin for Remmina.
+Package: remmina-plugin-spice
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ remmina (= ${binary:Version}),
+Description: Spice plugin for Remmina
+ Remmina is a remote desktop client written in GTK+, aiming to be
+ useful for system administrators and travellers, who need to work
+ with lots of remote computers in front of either large monitors or
+ tiny netbooks.
+ .
+ Remmina supports multiple network protocols in an integrated and
+ consistent user interface.
+ .
+ Currently RDP, VNC, SPICE, WWW, X2Go, EXEC and SSH are supported.
+ .
+ This package contains the Spice plugin for Remmina.
Package: remmina-plugin-secret
Architecture: any
--
2.35.1
