Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package remmina for openSUSE:Factory checked
in at 2021-07-01 07:05:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/remmina (Old)
and /work/SRC/openSUSE:Factory/.remmina.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "remmina"
Thu Jul 1 07:05:47 2021 rev:68 rq:903244 version:1.4.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/remmina/remmina.changes 2021-06-04
22:44:44.915228718 +0200
+++ /work/SRC/openSUSE:Factory/.remmina.new.2625/remmina.changes
2021-07-01 07:06:09.635230484 +0200
@@ -1,0 +2,23 @@
+Wed Jun 30 13:45:32 UTC 2021 - Johannes Weberhofer <jweberho...@weberhofer.at>
+
+- App-Indicator is now required
+- Added upstream mark-appindicator-as-required.patch to see better error
messages
+ when appindicator is not around
+
+- Update to 1.4.19
+ * Fix Freerdp Git Revision !2277
+ * UI improvements and cleanup !2278
+ * Desktop integration for the Remmina SNAP !2279
+ * Add process-control to the remmina snap !2276
+ * Adding SSH_AGENT support to the snap package !2280
+ * Adding option to disable smooth scrolling !2281
+ * Scrolled Viewport: use viewport_motion_handler as the only timeout
indicator !2282
+ * Adding TCP redirection through rdp2tcp !2283
+ * Added setting for RDP number of reconnect attempts !2284
+ * Add RDP reconnect interrupt on window close, fix crash introduced with
7c13b918.
+ Should fix #2079 (closed) !2286
+ * Removing GtkStatusIcon as deprecated !2285
+ * Adding advanced option to share multiple folders !2287
+ * Profile list grabs the focus when search is hidden !2288
+
+-------------------------------------------------------------------
Old:
----
Remmina-v1.4.18.tar.bz2
New:
----
Remmina-v1.4.19.tar.bz2
mark-appindicator-as-required.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ remmina.spec ++++++
--- /var/tmp/diff_new_pack.qAowaY/_old 2021-07-01 07:06:10.119226703 +0200
+++ /var/tmp/diff_new_pack.qAowaY/_new 2021-07-01 07:06:10.119226703 +0200
@@ -19,19 +19,19 @@
%bcond_without remmina_nx
%if 0%{?is_opensuse}
%bcond_without remmina_kwallet
-%bcond_without remmina_appindicator
%else
%bcond_with remmina_kwallet
-%bcond_with remmina_appindicator
%endif
Name: remmina
-Version: 1.4.18
+Version: 1.4.19
Release: 0
Summary: Versatile Remote Desktop Client
License: GPL-2.0-or-later
Group: Productivity/Networking/Other
URL: https://www.remmina.org/
Source0:
https://gitlab.com/Remmina/Remmina/-/archive/v%{version}/Remmina-v%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM mark-appindicator-as-required.patch
gl#Remmina/Remmina#2290
+Patch0: mark-appindicator-as-required.patch
BuildRequires: cmake
BuildRequires: cups-devel
BuildRequires: ed
@@ -44,6 +44,7 @@
BuildRequires: pcre2-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(appindicator3-0.1)
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(avahi-glib)
BuildRequires: pkgconfig(cairo)
@@ -75,9 +76,6 @@
%if 0%{?suse_version} > 1500
BuildRequires: pkgconfig(wayland-client)
%endif
-%if %{with remmina_appindicator}
-BuildRequires: pkgconfig(appindicator3-0.1)
-%endif
%description
Remmina is a remote desktop client written in GTK+, aiming to be useful for
@@ -225,11 +223,7 @@
%else
-DWITH_KF5WALLET=OFF \
%endif
-%if %{with remmina_appindicator}
-DWITH_APPINDICATOR=ON \
-%else
- -DWITH_APPINDICATOR=OFF \
-%endif
%if %{with remmina_nx}
-DWITH_NX=ON \
%else
@@ -252,7 +246,7 @@
%fdupes %{buildroot}%{_datadir}/remmina
%fdupes %{buildroot}%{_datadir}/icons/hicolor/*/actions
-%fdupes %{buildroot}%{_datadir}/icons/hicolor/scalable/panel
+%fdupes %{buildroot}%{_datadir}/icons/hicolor/[0-9]*
%find_lang %{name}
@@ -336,7 +330,7 @@
%{_datadir}/icons/hicolor/apps/remmina-symbolic.svg
%{_datadir}/icons/hicolor/scalable/emblems/remmina-sftp-symbolic.svg
%{_datadir}/icons/hicolor/scalable/emblems/remmina-ssh-symbolic.svg
-%{_datadir}/icons/hicolor/scalable/panel
+%{_datadir}/icons/hicolor/[1-9]*
%dir %{_datadir}/metainfo
%{_datadir}/metainfo/org.remmina.Remmina.appdata.xml
%{_datadir}/mime/packages/%{name}-mime.xml
++++++ Remmina-v1.4.18.tar.bz2 -> Remmina-v1.4.19.tar.bz2 ++++++
++++ 155030 lines of diff (skipped)
++++++ mark-appindicator-as-required.patch ++++++
>From f380ac597e8e6495701562a4b5263f661a952126 Mon Sep 17 00:00:00 2001
From: Antenore Gatta <anten...@simbiosi.org>
Date: Tue, 29 Jun 2021 22:44:40 +0200
Subject: [PATCH] Mark appindicator as required
---
cmake/FindAPPINDICATOR.cmake | 2 +-
src/CMakeLists.txt | 6 +++++-
src/remmina_icon.c | 26 --------------------------
3 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/cmake/FindAPPINDICATOR.cmake b/cmake/FindAPPINDICATOR.cmake
index d5e4e0623..916fc5757 100644
--- a/cmake/FindAPPINDICATOR.cmake
+++ b/cmake/FindAPPINDICATOR.cmake
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
include(FindPackageHandleStandardArgs)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c670c55d0..03270e54b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -265,11 +265,15 @@ if(sodium_FOUND)
endif()
if(GTK3_FOUND)
- find_suggested_package(APPINDICATOR)
+ find_required_package(APPINDICATOR)
if(APPINDICATOR_FOUND)
add_definitions(-DHAVE_LIBAPPINDICATOR)
include_directories(${APPINDICATOR_INCLUDE_DIRS})
target_link_libraries(remmina ${APPINDICATOR_LIBRARIES})
+ message(STATUS "AppIndicator library dirs
${APPINDICATOR_LIBRARIES}")
+ message(STATUS "AppIndicator include dirs
${APPINDICATOR_INCLUDE_DIRS}")
+ else()
+ message(FATAL_ERROR "AppIndicator not found")
endif()
find_required_package(JSONGLIB)
if(JSONGLIB_FOUND)
diff --git a/src/remmina_icon.c b/src/remmina_icon.c
index 332a78c3f..20b5bf941 100644
--- a/src/remmina_icon.c
+++ b/src/remmina_icon.c
@@ -58,10 +58,8 @@
#endif
typedef struct _RemminaIcon {
-#ifdef HAVE_LIBAPPINDICATOR
AppIndicator * icon;
gboolean indicator_connected;
-#endif
RemminaAvahi * avahi;
guint32 popup_time;
gchar * autostart_file;
@@ -74,9 +72,7 @@ void remmina_icon_destroy(void)
{
TRACE_CALL(__func__);
if (remmina_icon.icon) {
-#ifdef HAVE_LIBAPPINDICATOR
app_indicator_set_status(remmina_icon.icon,
APP_INDICATOR_STATUS_PASSIVE);
-#endif
remmina_icon.icon = NULL;
}
if (remmina_icon.avahi) {
@@ -240,8 +236,6 @@ static void remmina_icon_populate_extra_menu_item(GtkWidget
*menu)
g_signal_connect(G_OBJECT(menu), "edit-item",
G_CALLBACK(remmina_icon_on_edit_item), NULL);
}
-#ifdef HAVE_LIBAPPINDICATOR
-
void
remmina_icon_populate_menu(void)
{
@@ -265,8 +259,6 @@ remmina_icon_populate_menu(void)
}
}
-#endif
-
static void remmina_icon_save_autostart_file(GKeyFile *gkeyfile)
{
TRACE_CALL(__func__);
@@ -355,22 +347,13 @@ void remmina_icon_init(void)
strcpy(msg, "StatusNotifier/Appindicator support: ");
if (sni_supported) {
REMMINA_DEBUG("%s your desktop does support it", msg);
-#ifdef HAVE_LIBAPPINDICATOR
REMMINA_DEBUG("%s and libappindicator is compiled in Remmina.
Good.", msg);
-#else
- REMMINA_DEBUG("%s, but you did not compile Remmina with
CMake???s -DWITH_APPINDICATOR=on", msg);
-#endif
} else {
-#ifdef HAVE_LIBAPPINDICATOR
REMMINA_DEBUG("%snot supported by desktop. libappindicator will
try to fallback to GtkStatusIcon/xembed", msg);
-#else
- REMMINA_DEBUG("%snot supported by desktop.", msg);
-#endif
}
if (!remmina_icon.icon && !remmina_pref.disable_tray_icon) {
-#ifdef HAVE_LIBAPPINDICATOR
remmina_icon.icon = app_indicator_new("remmina-icon",
remmina_panel, APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
//app_indicator_set_icon_theme_path(remmina_icon.icon,
REMMINA_RUNTIME_DATADIR G_DIR_SEPARATOR_S "icons");
//const gchar *theme_path =
app_indicator_get_icon_theme_path(remmina_icon.icon);
@@ -379,18 +362,11 @@ void remmina_icon_init(void)
app_indicator_set_status(remmina_icon.icon,
APP_INDICATOR_STATUS_ACTIVE);
app_indicator_set_title(remmina_icon.icon, "Remmina");
remmina_icon_populate_menu();
-#else
- REMMINA_DEBUG("GtkStatusIcon support has been droppen since Gtk
3.14")
-#endif
} else if (remmina_icon.icon) {
-#ifdef HAVE_LIBAPPINDICATOR
app_indicator_set_status(remmina_icon.icon,
remmina_pref.disable_tray_icon ?
APP_INDICATOR_STATUS_PASSIVE :
APP_INDICATOR_STATUS_ACTIVE);
/* With libappindicator we can also change the icon on the fly
*/
app_indicator_set_icon(remmina_icon.icon, remmina_panel);
-#else
- REMMINA_DEBUG("GtkStatusIcon support has been droppen since Gtk
3.14")
-#endif
}
if (!remmina_icon.avahi)
remmina_icon.avahi = remmina_avahi_new();
@@ -407,10 +383,8 @@ void remmina_icon_init(void)
remmina_icon_create_autostart_file();
}
// "connected" property means a visible indicator, otherwise could be
hidden. or fall back to GtkStatusIcon
-#ifdef HAVE_LIBAPPINDICATOR
g_signal_connect (G_OBJECT(remmina_icon.icon), "connection-changed",
G_CALLBACK(remmina_icon_connection_changed_cb), NULL);
g_object_get(G_OBJECT(remmina_icon.icon), "connected",
&remmina_icon.indicator_connected, NULL);
-#endif
}
gboolean remmina_icon_is_autostart(void)
--
GitLab
