[arch-commits] Commit in remmina/trunk (PKGBUILD vte2.91.patch)
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
===
--- PKGBUILD2014-12-09 05:51:44 UTC (rev 123678)
+++ PKGBUILD2014-12-09 11:55:04 UTC (rev 123679)
@@ -2,8 +2,8 @@
# Maintainer: Sergej Pupykin pupykin.s+a...@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.0 +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.0
+0400
-+++ Remmina-1.1.1.my/remmina/CMakeLists.txt2014-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.0 +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
[arch-commits] Commit in remmina/trunk (PKGBUILD vte2.91.patch)
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
===
--- PKGBUILD2014-10-14 09:56:31 UTC (rev 120635)
+++ PKGBUILD2014-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.cmake2012-02-10
19:54:23.0 +0100
-+++ FreeRDP-Remmina-356c033-vte2.91/cmake/FindVTE.cmake2014-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.0 +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.0 +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.0
+0400
Remmina-1.1.1.my/remmina/CMakeLists.txt2014-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.0 +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.0 +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
[arch-commits] Commit in remmina/trunk (PKGBUILD vte2.91.patch)
Date: Monday, September 29, 2014 @ 00:37:04
Author: heftig
Revision: 119722
vte2.91
Added:
remmina/trunk/vte2.91.patch
Modified:
remmina/trunk/PKGBUILD
---+
PKGBUILD | 50
vte2.91.patch | 76
2 files changed, 104 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-28 22:27:09 UTC (rev 119721)
+++ PKGBUILD2014-09-28 22:37:04 UTC (rev 119722)
@@ -3,7 +3,7 @@
pkgname=remmina
pkgver=1.0.0
-pkgrel=12
+pkgrel=13
pkgdesc=remote desktop client written in GTK+
arch=(i686 x86_64)
url=http://remmina.sourceforge.net/;
@@ -10,27 +10,28 @@
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')
optdepends=('libxkbfile'
- 'freerdp'
- 'telepathy-glib'
- 'gnome-keyring'
- 'nxproxy'
- 'xorg-server-xephyr: XDMCP support')
+'freerdp'
+'telepathy-glib'
+'gnome-keyring'
+'nxproxy'
+'xorg-server-xephyr: XDMCP support')
replaces=('remmina-plugins')
provides=('remmina-plugins')
install=remmina.install
source=(https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz;
- '569d9bb7.patch'
- 'f7d1038b.patch'
- '1aebfc02.patch'
- '3ebdd6e7.patch'
- '97c2af8c.patch'
- '84327f81.patch'
- 'c1ef3a16.patch'
- '6ee20289.patch'
- 'b2277827.patch'
- 'cb0b209b.patch')
+'569d9bb7.patch'
+'f7d1038b.patch'
+'1aebfc02.patch'
+'3ebdd6e7.patch'
+'97c2af8c.patch'
+'84327f81.patch'
+'c1ef3a16.patch'
+'6ee20289.patch'
+'b2277827.patch'
+'cb0b209b.patch'
+'vte2.91.patch')
md5sums=('701c540acaab961bc3adf130a2ddb8b1'
'9862af7dce8ff1f7ebc3f75d24f45c01'
'a54f63bce0986e72efd5fb74f55d1fe3'
@@ -41,17 +42,22 @@
'2555c8bd32e6ee5f4bdabe69b8f6ff05'
'b45cd76a3e3f4b667967f5cdc932a6fd'
'cd09458b305159fbf408c95520ba062c'
- '80bcf469fca7ee88eb7dd8a4f914f1d2')
+ '80bcf469fca7ee88eb7dd8a4f914f1d2'
+ 'a784e86b570e68afffe6ad4191f1bd00')
-build() {
+prepare() {
cd ${srcdir}/FreeRDP-Remmina-*/
- for i in ${source[@]}; do
-if [ ${i:(-6)} == .patch ]; then
- patch -p1 -i ${srcdir}/${i:(-14)}
+ for i in ${source[@]}; do
+if [[ $i == *.patch ]]; then
+ patch -p1 -i ${srcdir}/${i}
fi
done
+}
+build() {
+ cd ${srcdir}/FreeRDP-Remmina-*/
+
export LDFLAGS=-lX11 -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0
-lgthread-2.0 -lpthread -lgnutls
cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_APPINDICATOR=OFF .
make
Added: vte2.91.patch
===
--- vte2.91.patch (rev 0)
+++ vte2.91.patch 2014-09-28 22:37:04 UTC (rev 119722)
@@ -0,0 +1,76 @@
+diff -u -r FreeRDP-Remmina-356c033/cmake/FindVTE.cmake
FreeRDP-Remmina-356c033-vte2.91/cmake/FindVTE.cmake
+--- FreeRDP-Remmina-356c033/cmake/FindVTE.cmake2012-02-10
19:54:23.0 +0100
FreeRDP-Remmina-356c033-vte2.91/cmake/FindVTE.cmake2014-09-29
00:20:35.587690451 +0200
+@@ -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 -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.0 +0100
FreeRDP-Remmina-356c033-vte2.91/remmina/CMakeLists.txt 2014-09-29
00:09:44.300246827 +0200
+@@ -111,7 +111,7 @@
+ endif()
+
+ if(GTK3_FOUND)
+- set(_VTE_VERSION_NUM 2.90)
++ set(_VTE_VERSION_NUM 2.91)
+ 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.0 +0100
FreeRDP-Remmina-356c033-vte2.91/remmina/src/remmina_ssh_plugin.c
2014-09-29 00:34:04.011022184 +0200
+@@ -56,6 +56,7 @@
+ gboolean cont = FALSE;
+ gint ret;
+ gchar *charset;
++ VtePty *pty;
+
+ pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL);
+ CANCEL_ASYNC
