Hello community, here is the log from the commit of package remmina for openSUSE:Factory checked in at 2014-10-07 16:00:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/remmina (Old) and /work/SRC/openSUSE:Factory/.remmina.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "remmina" Changes: -------- --- /work/SRC/openSUSE:Factory/remmina/remmina.changes 2013-03-25 20:42:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.remmina.new/remmina.changes 2014-10-07 16:01:35.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Oct 7 09:26:12 UTC 2014 - gber@opensuse.org + +- add remmina-vte-2.91-support.patch in order to support building + against vte-2.91 for openSUSE >= 13.2 +- rename README.SuSE to README.SUSE + +------------------------------------------------------------------- +Tue Oct 7 06:29:40 UTC 2014 - dmueller@suse.com + +- fix build against Factory + +------------------------------------------------------------------- Old: ---- README.SuSE New: ---- README.SUSE remmina-vte-2.91-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ remmina.spec ++++++ --- /var/tmp/diff_new_pack.XjifWX/_old 2014-10-07 16:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.XjifWX/_new 2014-10-07 16:01:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package remmina # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Group: Productivity/Networking/Other Url: http://remmina.sourceforge.net/ Source0: https://github.com/downloads/FreeRDP/Remmina/Remmina-%{version}.tar.gz -Source1: README.SuSE +Source1: README.SUSE # PATCH-FIX-UPSTREAM remmina-fix-linker-issue.patch gankov@opensuse.org -- Fixes linking issue (backport from upstream git) Patch0: remmina-fix-linker-issue.patch # PATCH-FIX-UPSTREAM remmina-fix-desktop-file.patch gber@opensuse.org -- Fixes the installation of the .desktop file (backport from upstream git) @@ -45,6 +45,8 @@ Patch7: remmina-fix-window-resize.patch # PATCH-FIX-UPSTREAM remmina-fix-fullscreen-with-multiple-monitors.patch gber@opensuse.org -- Fix fullscreen mode with multiple monitors (backport from upstream git) Patch8: remmina-fix-fullscreen-with-multiple-monitors.patch +# PATCH-FIX-UPSTREAM remmina-vte-2.91-support.patch gber@opensuse.org -- Support building against vte 2.91 +Patch9: remmina-vte-2.91-support.patch BuildRequires: cmake BuildRequires: ed BuildRequires: intltool @@ -65,14 +67,13 @@ BuildRequires: pkgconfig(telepathy-glib) BuildRequires: pkgconfig(unique-1.0) BuildRequires: pkgconfig(xkbfile) -%if 0%{?suse_version} >= 1210 -BuildRequires: pkgconfig(gtk+-3.0) +# vte-2.90 has been dropped from newer releases +%if 0%{?suse_version} < 1320 BuildRequires: pkgconfig(vte-2.90) %else -BuildRequires: pkgconfig(gdk-x11-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(vte) +BuildRequires: pkgconfig(vte-2.91) %endif +BuildRequires: pkgconfig(gtk+-3.0) Provides: remmina-plugins-common = %{version} Obsoletes: remmina-plugins-common < 1.0.0 Recommends: %{name}-lang = %{version} @@ -162,7 +163,10 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -cp -r %{SOURCE1} README.SuSE +%if 0%{?suse_version} >= 1320 +%patch9 -p1 +%endif +cp -r %{SOURCE1} README.SUSE %build mkdir build @@ -236,7 +240,7 @@ %files %defattr(-,root,root) -%doc remmina/AUTHORS remmina/COPYING remmina/ChangeLog README README.SuSE +%doc remmina/AUTHORS remmina/COPYING remmina/ChangeLog README README.SUSE %{_bindir}/remmina %{_datadir}/applications/remmina.desktop %{_datadir}/icons/hicolor/*/actions/* ++++++ README.SUSE ++++++ This package only provides the Remmina base application. Support for the XDMCP, NX, VNC or RDP protocols or Telepathy is provided by plugin packages named remmina-plugin-<plugin-name> which need be installed separately. ++++++ remmina-vte-2.91-support.patch ++++++ $OpenBSD: patch-cmake_FindVTE_cmake,v 1.1 2014/10/06 07:27:05 jasper Exp $ Adjust to new VTE 2.91 API Index: FreeRDP-Remmina-356c033/cmake/FindVTE.cmake =================================================================== --- FreeRDP-Remmina-356c033.orig/cmake/FindVTE.cmake +++ FreeRDP-Remmina-356c033/cmake/FindVTE.cmake @@ -21,12 +21,10 @@ if(NOT _VTE_VERSION_NUM) set(_VTE_LIB_NAME vte) set(_VTE_VERSION vte) else() - set(_VTE_LIB_NAME vte${_VTE_VERSION_NUM}) + set(_VTE_LIB_NAME vte-${_VTE_VERSION_NUM}) set(_VTE_VERSION vte-${_VTE_VERSION_NUM}) endif() -string(REPLACE . _ _VTE_LIB_NAME ${_VTE_LIB_NAME}) - pkg_check_modules(PC_VTE ${_VTE_VERSION}) find_path(VTE_INCLUDE_DIR NAMES vte/vte.h Index: FreeRDP-Remmina-356c033/remmina/CMakeLists.txt =================================================================== --- FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt +++ FreeRDP-Remmina-356c033/remmina/CMakeLists.txt @@ -120,7 +120,7 @@ if(AVAHI_FOUND) endif() if(GTK3_FOUND) - set(_VTE_VERSION_NUM 2.90) + set(_VTE_VERSION_NUM 2.91) else() set(_VTE_VERSION_NUM) endif() Index: FreeRDP-Remmina-356c033/remmina/src/remmina_ssh_plugin.c =================================================================== --- FreeRDP-Remmina-356c033.orig/remmina/src/remmina_ssh_plugin.c +++ FreeRDP-Remmina-356c033/remmina/src/remmina_ssh_plugin.c @@ -122,9 +122,10 @@ remmina_plugin_ssh_main_thread (gpointer THREADS_ENTER if (charset && charset[0] != '\0') { - vte_terminal_set_encoding (VTE_TERMINAL (gpdata->vte), charset); + vte_terminal_set_encoding (VTE_TERMINAL (gpdata->vte), charset, NULL); } - vte_terminal_set_pty (VTE_TERMINAL (gpdata->vte), shell->slave); + vte_terminal_set_pty (VTE_TERMINAL (gpdata->vte), + vte_pty_new_foreign_sync (shell->slave, NULL, NULL)); THREADS_LEAVE remmina_plugin_service->protocol_plugin_emit_signal (gp, "connect"); @@ -169,7 +170,11 @@ remmina_plugin_ssh_set_vte_pref (Remmina gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data"); if (remmina_pref.vte_font && remmina_pref.vte_font[0]) { - vte_terminal_set_font_from_string (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_font); + PangoFontDescription *desc; + + desc = pango_font_description_from_string (remmina_pref.vte_font); + vte_terminal_set_font (VTE_TERMINAL (gpdata->vte), desc); + pango_font_description_free (desc); } vte_terminal_set_allow_bold (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_allow_bold_text); if (remmina_pref.vte_lines > 0) @@ -205,7 +210,7 @@ remmina_plugin_ssh_init (RemminaProtocol remmina_plugin_service->protocol_plugin_register_hostkey (gp, vte); - vscrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment (VTE_TERMINAL (vte))); + vscrollbar = gtk_vscrollbar_new (gtk_scrollable_get_vadjustment(GTK_SCROLLABLE (vte))); gtk_widget_show(vscrollbar); gtk_box_pack_start (GTK_BOX (hbox), vscrollbar, FALSE, TRUE, 0); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org