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

[Sergej Pupykin]

    Date: Tuesday, December 9, 2014 @ 12:55:04
  Author: spupykin
Revision: 123679

upgpkg: remmina 1.1.2-1

upd

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

---------------+
 PKGBUILD      |   14 ++++-----
 vte2.91.patch |   79 --------------------------------------------------------
 2 files changed, 6 insertions(+), 87 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-09 05:51:44 UTC (rev 123678)
+++ PKGBUILD	2014-12-09 11:55:04 UTC (rev 123679)
@@ -2,8 +2,8 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=remmina
-pkgver=1.1.1
-pkgrel=4
+pkgver=1.1.2
+pkgrel=1
 pkgdesc="remote desktop client written in GTK+"
 arch=(i686 x86_64)
 url="http://freerdp.github.io/Remmina/"
@@ -22,12 +22,10 @@
 replaces=('remmina-plugins')
 provides=('remmina-plugins')
 install=remmina.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v1.1.1.tar.gz"
-	"freerdp-1.2.patch"
-	"vte2.91.patch")
-md5sums=('481dd96ebf7b14e4fd4df8648040b725'
-         '509ded89b6a2858b3091698d380da831'
-         '5d8e0245ed23b856b35b02bf1a69c0a4')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v$pkgver.tar.gz"
+	"freerdp-1.2.patch")
+md5sums=('825b4dbee7053a059ac314ca11714219'
+         '509ded89b6a2858b3091698d380da831')
 
 prepare() {
   cd ${srcdir}/Remmina-$pkgver/

Deleted: vte2.91.patch
===================================================================
--- vte2.91.patch	2014-12-09 05:51:44 UTC (rev 123678)
+++ vte2.91.patch	2014-12-09 11:55:04 UTC (rev 123679)
@@ -1,79 +0,0 @@
-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)
- 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
-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)
--	set(_VTE_VERSION_NUM 2.90)
-+	set(_VTE_VERSION_NUM 2.91)
- else()
- 	set(_VTE_VERSION_NUM)
- endif()
-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;
-+	VtePty *pty;
- 
- 	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL);
- 	CANCEL_ASYNC
-@@ -136,9 +137,11 @@
- 	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);
-+	pty = vte_pty_new_foreign_sync (shell->slave, NULL, NULL);
-+	vte_terminal_set_pty (VTE_TERMINAL (gpdata->vte), pty);
-+	g_object_unref (pty);
- 	THREADS_LEAVE
- 
- 	remmina_plugin_service->protocol_plugin_emit_signal (gp, "connect");
-@@ -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])
- 	{
--		vte_terminal_set_font_from_string (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_font);
-+		PangoFontDescription *font;
-+		
-+		font = pango_font_description_from_string (remmina_pref.vte_font);
-+		vte_terminal_set_font (VTE_TERMINAL (gpdata->vte), font);
-+		pango_font_description_free (font);
- 	}
- 	vte_terminal_set_allow_bold (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_allow_bold_text);
- 	if (remmina_pref.vte_lines > 0)
-@@ -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);