[arch-commits] Commit in remmina/trunk (PKGBUILD vte2.91.patch)

[Sergej Pupykin]

    Date: Tuesday, October 14, 2014 @ 13:14:18
  Author: spupykin
Revision: 120636

upgpkg: remmina 1.1.1-1

upd

Modified:
  remmina/trunk/PKGBUILD
  remmina/trunk/vte2.91.patch

---------------+
 PKGBUILD      |    8 +++++---
 vte2.91.patch |   35 +++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-14 09:56:31 UTC (rev 120635)
+++ PKGBUILD	2014-10-14 11:14:18 UTC (rev 120636)
@@ -10,13 +10,15 @@
 license=('GPL')
 depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp')
 makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
-             'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib')
+             'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib'
+             'libvncserver')
 optdepends=('libxkbfile'
             'freerdp'
             'telepathy-glib'
             'gnome-keyring'
             'nxproxy'
-            'xorg-server-xephyr: XDMCP support')
+            'xorg-server-xephyr: XDMCP support'
+            'libvncserver')
 replaces=('remmina-plugins')
 provides=('remmina-plugins')
 install=remmina.install
@@ -23,7 +25,7 @@
 source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v1.1.1.tar.gz"
 	"vte2.91.patch")
 md5sums=('481dd96ebf7b14e4fd4df8648040b725'
-         'a784e86b570e68afffe6ad4191f1bd00')
+         '5d8e0245ed23b856b35b02bf1a69c0a4')
 
 prepare() {
   cd ${srcdir}/Remmina-$pkgver/

Modified: vte2.91.patch
===================================================================
--- vte2.91.patch	2014-10-14 09:56:31 UTC (rev 120635)
+++ vte2.91.patch	2014-10-14 11:14:18 UTC (rev 120636)
@@ -1,6 +1,6 @@
-diff -u -r FreeRDP-Remmina-356c033/cmake/FindVTE.cmake FreeRDP-Remmina-356c033-vte2.91/cmake/FindVTE.cmake
---- FreeRDP-Remmina-356c033/cmake/FindVTE.cmake	2012-02-10 19:54:23.000000000 +0100
-+++ FreeRDP-Remmina-356c033-vte2.91/cmake/FindVTE.cmake	2014-09-29 00:20:35.587690451 +0200
+diff -wbBur Remmina-1.1.1/cmake/FindVTE.cmake Remmina-1.1.1.my/cmake/FindVTE.cmake
+--- Remmina-1.1.1/cmake/FindVTE.cmake	2014-10-10 16:25:23.000000000 +0400
++++ Remmina-1.1.1.my/cmake/FindVTE.cmake	2014-10-14 14:49:27.137492206 +0400
 @@ -21,12 +21,10 @@
  	set(_VTE_LIB_NAME vte)
  	set(_VTE_VERSION vte)
@@ -15,10 +15,10 @@
  pkg_check_modules(PC_VTE ${_VTE_VERSION})
  
  find_path(VTE_INCLUDE_DIR NAMES vte/vte.h
-diff -u -r FreeRDP-Remmina-356c033/remmina/CMakeLists.txt FreeRDP-Remmina-356c033-vte2.91/remmina/CMakeLists.txt
---- FreeRDP-Remmina-356c033/remmina/CMakeLists.txt	2012-02-10 19:54:23.000000000 +0100
-+++ FreeRDP-Remmina-356c033-vte2.91/remmina/CMakeLists.txt	2014-09-29 00:09:44.300246827 +0200
-@@ -111,7 +111,7 @@
+diff -wbBur Remmina-1.1.1/remmina/CMakeLists.txt Remmina-1.1.1.my/remmina/CMakeLists.txt
+--- Remmina-1.1.1/remmina/CMakeLists.txt	2014-10-10 16:25:23.000000000 +0400
++++ Remmina-1.1.1.my/remmina/CMakeLists.txt	2014-10-14 14:49:27.137492206 +0400
+@@ -138,7 +138,7 @@
  endif()
  
  if(GTK3_FOUND)
@@ -27,10 +27,10 @@
  else()
  	set(_VTE_VERSION_NUM)
  endif()
-diff -u -r FreeRDP-Remmina-356c033/remmina/src/remmina_ssh_plugin.c FreeRDP-Remmina-356c033-vte2.91/remmina/src/remmina_ssh_plugin.c
---- FreeRDP-Remmina-356c033/remmina/src/remmina_ssh_plugin.c	2012-02-10 19:54:23.000000000 +0100
-+++ FreeRDP-Remmina-356c033-vte2.91/remmina/src/remmina_ssh_plugin.c	2014-09-29 00:34:04.011022184 +0200
-@@ -56,6 +56,7 @@
+diff -wbBur Remmina-1.1.1/remmina/src/remmina_ssh_plugin.c Remmina-1.1.1.my/remmina/src/remmina_ssh_plugin.c
+--- Remmina-1.1.1/remmina/src/remmina_ssh_plugin.c	2014-10-10 16:25:23.000000000 +0400
++++ Remmina-1.1.1.my/remmina/src/remmina_ssh_plugin.c	2014-10-14 14:53:32.563464867 +0400
+@@ -70,6 +70,7 @@
  	gboolean cont = FALSE;
  	gint ret;
  	gchar *charset;
@@ -38,7 +38,7 @@
  
  	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL);
  	CANCEL_ASYNC
-@@ -122,9 +123,11 @@
+@@ -136,9 +137,11 @@
  	THREADS_ENTER
  	if (charset && charset[0] != '\0')
  	{
@@ -52,7 +52,7 @@
  	THREADS_LEAVE
  
  	remmina_plugin_service->protocol_plugin_emit_signal (gp, "connect");
-@@ -169,7 +172,11 @@
+@@ -183,7 +186,11 @@
  	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
  	if (remmina_pref.vte_font && remmina_pref.vte_font[0])
  	{
@@ -65,12 +65,15 @@
  	}
  	vte_terminal_set_allow_bold (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_allow_bold_text);
  	if (remmina_pref.vte_lines > 0)
-@@ -205,7 +212,7 @@
- 
+@@ -224,9 +231,9 @@
  	remmina_plugin_service->protocol_plugin_register_hostkey (gp, vte);
  
+ #if GTK_VERSION == 3
+-	vscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, vte_terminal_get_adjustment (VTE_TERMINAL (vte)));
++	vscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (vte)));
+ #elif GTK_VERSION == 2
 -	vscrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment (VTE_TERMINAL (vte)));
 +	vscrollbar = gtk_vscrollbar_new (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (vte)));
+ #endif
  	gtk_widget_show(vscrollbar);
  	gtk_box_pack_start (GTK_BOX (hbox), vscrollbar, FALSE, TRUE, 0);
- }