[arch-commits] Commit in remmina/repos (14 files)

Sergej Pupykin spupykin at archlinux.org
Tue Dec 9 11:55:19 UTC 2014


    Date: Tuesday, December 9, 2014 @ 12:55:19
  Author: spupykin
Revision: 123680

archrelease: copy trunk to community-i686, community-x86_64

Added:
  remmina/repos/community-i686/PKGBUILD
    (from rev 123679, remmina/trunk/PKGBUILD)
  remmina/repos/community-i686/freerdp-1.2.patch
    (from rev 123679, remmina/trunk/freerdp-1.2.patch)
  remmina/repos/community-i686/remmina.install
    (from rev 123679, remmina/trunk/remmina.install)
  remmina/repos/community-x86_64/PKGBUILD
    (from rev 123679, remmina/trunk/PKGBUILD)
  remmina/repos/community-x86_64/freerdp-1.2.patch
    (from rev 123679, remmina/trunk/freerdp-1.2.patch)
  remmina/repos/community-x86_64/remmina.install
    (from rev 123679, remmina/trunk/remmina.install)
Deleted:
  remmina/repos/community-i686/PKGBUILD
  remmina/repos/community-i686/freerdp-1.2.patch
  remmina/repos/community-i686/remmina.install
  remmina/repos/community-i686/vte2.91.patch
  remmina/repos/community-x86_64/PKGBUILD
  remmina/repos/community-x86_64/freerdp-1.2.patch
  remmina/repos/community-x86_64/remmina.install
  remmina/repos/community-x86_64/vte2.91.patch

------------------------------------+
 /PKGBUILD                          |  104 ++++++++++++++++++++++++++++++++++
 /freerdp-1.2.patch                 |  106 +++++++++++++++++++++++++++++++++++
 /remmina.install                   |   22 +++++++
 community-i686/PKGBUILD            |   54 -----------------
 community-i686/freerdp-1.2.patch   |   53 -----------------
 community-i686/remmina.install     |   11 ---
 community-i686/vte2.91.patch       |   79 --------------------------
 community-x86_64/PKGBUILD          |   54 -----------------
 community-x86_64/freerdp-1.2.patch |   53 -----------------
 community-x86_64/remmina.install   |   11 ---
 community-x86_64/vte2.91.patch     |   79 --------------------------
 11 files changed, 232 insertions(+), 394 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-12-09 11:55:04 UTC (rev 123679)
+++ community-i686/PKGBUILD	2014-12-09 11:55:19 UTC (rev 123680)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=remmina
-pkgver=1.1.1
-pkgrel=4
-pkgdesc="remote desktop client written in GTK+"
-arch=(i686 x86_64)
-url="http://freerdp.github.io/Remmina/"
-license=('GPL')
-depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp')
-makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
-             'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib'
-             'libvncserver')
-optdepends=('libxkbfile'
-            'freerdp'
-            'telepathy-glib'
-            'gnome-keyring'
-            'nxproxy'
-            'xorg-server-xephyr: XDMCP support'
-            'libvncserver: VNC client/server support')
-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')
-
-prepare() {
-  cd ${srcdir}/Remmina-$pkgver/
-  for i in "${source[@]}"; do
-    if [[ $i == *.patch ]]; then
-      patch -F100 -p1 -i "${srcdir}/${i}"
-    fi
-  done
-}
-
-build() {
-  cd ${srcdir}/Remmina-$pkgver/
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DWITH_APPINDICATOR=OFF .
-  make
-}
-
-package() {
-  cd ${srcdir}/Remmina-$pkgver/
-  make DESTDIR=${pkgdir} install
-  rm -rf $pkgdir/build
-}

Copied: remmina/repos/community-i686/PKGBUILD (from rev 123679, remmina/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-12-09 11:55:19 UTC (rev 123680)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=remmina
+pkgver=1.1.2
+pkgrel=1
+pkgdesc="remote desktop client written in GTK+"
+arch=(i686 x86_64)
+url="http://freerdp.github.io/Remmina/"
+license=('GPL')
+depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp')
+makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
+             'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib'
+             'libvncserver')
+optdepends=('libxkbfile'
+            'freerdp'
+            'telepathy-glib'
+            'gnome-keyring'
+            'nxproxy'
+            'xorg-server-xephyr: XDMCP support'
+            'libvncserver: VNC client/server support')
+replaces=('remmina-plugins')
+provides=('remmina-plugins')
+install=remmina.install
+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/
+  for i in "${source[@]}"; do
+    if [[ $i == *.patch ]]; then
+      patch -F100 -p1 -i "${srcdir}/${i}"
+    fi
+  done
+}
+
+build() {
+  cd ${srcdir}/Remmina-$pkgver/
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DWITH_APPINDICATOR=OFF .
+  make
+}
+
+package() {
+  cd ${srcdir}/Remmina-$pkgver/
+  make DESTDIR=${pkgdir} install
+  rm -rf $pkgdir/build
+}

Deleted: community-i686/freerdp-1.2.patch
===================================================================
--- community-i686/freerdp-1.2.patch	2014-12-09 11:55:04 UTC (rev 123679)
+++ community-i686/freerdp-1.2.patch	2014-12-09 11:55:19 UTC (rev 123680)
@@ -1,53 +0,0 @@
-diff -wbBur Remmina-1.1.1/cmake/FindFREERDP.cmake Remmina-1.1.1.my/cmake/FindFREERDP.cmake
---- Remmina-1.1.1/cmake/FindFREERDP.cmake	2014-10-10 16:25:23.000000000 +0400
-+++ Remmina-1.1.1.my/cmake/FindFREERDP.cmake	2014-11-19 19:32:40.112459977 +0300
-@@ -24,19 +24,7 @@
- find_path(FREERDP_INCLUDE_DIR NAMES freerdp/freerdp.h
- 	HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS})
- 
--find_library(FREERDP_LIBRARY NAMES freerdp-core
--	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_GDI_LIBRARY NAMES freerdp-gdi
--	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_LOCALE_LIBRARY NAMES freerdp-locale
--	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_RAIL_LIBRARY NAMES freerdp-rail
--	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_CODEC_LIBRARY NAMES freerdp-codec
-+find_library(FREERDP_LIBRARY NAMES freerdp
- 	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
- 
- find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client
-@@ -46,7 +34,7 @@
- 
- find_package_handle_standard_args(FREERDP DEFAULT_MSG FREERDP_LIBRARY FREERDP_INCLUDE_DIR)
- 
--set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_GDI_LIBRARY} ${FREERDP_LOCALE_LIBRARY} ${FREERDP_RAIL_LIBRARY} ${FREERDP_CODEC_LIBRARY} ${FREERDP_CLIENT_LIBRARY})
-+set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_CLIENT_LIBRARY})
- set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR})
- 
- mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY)
-diff -wbBur Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c
---- Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c	2014-10-10 16:25:23.000000000 +0400
-+++ Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c	2014-11-19 19:36:32.241877093 +0300
-@@ -257,7 +257,7 @@
- 		settings->LargePointerFlag = True;
- 		settings->PerformanceFlags = PERF_FLAG_NONE;
- 
--		rfi->rfx_context = rfx_context_new();
-+		rfi->rfx_context = rfx_context_new(FALSE);
- 	}
- 
- 	freerdp_client_load_addins(instance->context->channels, instance->settings);
-@@ -1198,7 +1198,6 @@
- 
- 	remmina_rdp_settings_init();
- 	freerdp_handle_signals();
--	freerdp_channels_global_init();
- 
- 	return TRUE;
- }

Copied: remmina/repos/community-i686/freerdp-1.2.patch (from rev 123679, remmina/trunk/freerdp-1.2.patch)
===================================================================
--- community-i686/freerdp-1.2.patch	                        (rev 0)
+++ community-i686/freerdp-1.2.patch	2014-12-09 11:55:19 UTC (rev 123680)
@@ -0,0 +1,53 @@
+diff -wbBur Remmina-1.1.1/cmake/FindFREERDP.cmake Remmina-1.1.1.my/cmake/FindFREERDP.cmake
+--- Remmina-1.1.1/cmake/FindFREERDP.cmake	2014-10-10 16:25:23.000000000 +0400
++++ Remmina-1.1.1.my/cmake/FindFREERDP.cmake	2014-11-19 19:32:40.112459977 +0300
+@@ -24,19 +24,7 @@
+ find_path(FREERDP_INCLUDE_DIR NAMES freerdp/freerdp.h
+ 	HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS})
+ 
+-find_library(FREERDP_LIBRARY NAMES freerdp-core
+-	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+-
+-find_library(FREERDP_GDI_LIBRARY NAMES freerdp-gdi
+-	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+-
+-find_library(FREERDP_LOCALE_LIBRARY NAMES freerdp-locale
+-	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+-
+-find_library(FREERDP_RAIL_LIBRARY NAMES freerdp-rail
+-	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+-
+-find_library(FREERDP_CODEC_LIBRARY NAMES freerdp-codec
++find_library(FREERDP_LIBRARY NAMES freerdp
+ 	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+ 
+ find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client
+@@ -46,7 +34,7 @@
+ 
+ find_package_handle_standard_args(FREERDP DEFAULT_MSG FREERDP_LIBRARY FREERDP_INCLUDE_DIR)
+ 
+-set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_GDI_LIBRARY} ${FREERDP_LOCALE_LIBRARY} ${FREERDP_RAIL_LIBRARY} ${FREERDP_CODEC_LIBRARY} ${FREERDP_CLIENT_LIBRARY})
++set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_CLIENT_LIBRARY})
+ set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR})
+ 
+ mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY)
+diff -wbBur Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c
+--- Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c	2014-10-10 16:25:23.000000000 +0400
++++ Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c	2014-11-19 19:36:32.241877093 +0300
+@@ -257,7 +257,7 @@
+ 		settings->LargePointerFlag = True;
+ 		settings->PerformanceFlags = PERF_FLAG_NONE;
+ 
+-		rfi->rfx_context = rfx_context_new();
++		rfi->rfx_context = rfx_context_new(FALSE);
+ 	}
+ 
+ 	freerdp_client_load_addins(instance->context->channels, instance->settings);
+@@ -1198,7 +1198,6 @@
+ 
+ 	remmina_rdp_settings_init();
+ 	freerdp_handle_signals();
+-	freerdp_channels_global_init();
+ 
+ 	return TRUE;
+ }

Deleted: community-i686/remmina.install
===================================================================
--- community-i686/remmina.install	2014-12-09 11:55:04 UTC (rev 123679)
+++ community-i686/remmina.install	2014-12-09 11:55:19 UTC (rev 123680)
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: remmina/repos/community-i686/remmina.install (from rev 123679, remmina/trunk/remmina.install)
===================================================================
--- community-i686/remmina.install	                        (rev 0)
+++ community-i686/remmina.install	2014-12-09 11:55:19 UTC (rev 123680)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: community-i686/vte2.91.patch
===================================================================
--- community-i686/vte2.91.patch	2014-12-09 11:55:04 UTC (rev 123679)
+++ community-i686/vte2.91.patch	2014-12-09 11:55:19 UTC (rev 123680)
@@ -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);

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-12-09 11:55:04 UTC (rev 123679)
+++ community-x86_64/PKGBUILD	2014-12-09 11:55:19 UTC (rev 123680)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=remmina
-pkgver=1.1.1
-pkgrel=4
-pkgdesc="remote desktop client written in GTK+"
-arch=(i686 x86_64)
-url="http://freerdp.github.io/Remmina/"
-license=('GPL')
-depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp')
-makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
-             'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib'
-             'libvncserver')
-optdepends=('libxkbfile'
-            'freerdp'
-            'telepathy-glib'
-            'gnome-keyring'
-            'nxproxy'
-            'xorg-server-xephyr: XDMCP support'
-            'libvncserver: VNC client/server support')
-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')
-
-prepare() {
-  cd ${srcdir}/Remmina-$pkgver/
-  for i in "${source[@]}"; do
-    if [[ $i == *.patch ]]; then
-      patch -F100 -p1 -i "${srcdir}/${i}"
-    fi
-  done
-}
-
-build() {
-  cd ${srcdir}/Remmina-$pkgver/
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DWITH_APPINDICATOR=OFF .
-  make
-}
-
-package() {
-  cd ${srcdir}/Remmina-$pkgver/
-  make DESTDIR=${pkgdir} install
-  rm -rf $pkgdir/build
-}

Copied: remmina/repos/community-x86_64/PKGBUILD (from rev 123679, remmina/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-12-09 11:55:19 UTC (rev 123680)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=remmina
+pkgver=1.1.2
+pkgrel=1
+pkgdesc="remote desktop client written in GTK+"
+arch=(i686 x86_64)
+url="http://freerdp.github.io/Remmina/"
+license=('GPL')
+depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp')
+makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
+             'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib'
+             'libvncserver')
+optdepends=('libxkbfile'
+            'freerdp'
+            'telepathy-glib'
+            'gnome-keyring'
+            'nxproxy'
+            'xorg-server-xephyr: XDMCP support'
+            'libvncserver: VNC client/server support')
+replaces=('remmina-plugins')
+provides=('remmina-plugins')
+install=remmina.install
+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/
+  for i in "${source[@]}"; do
+    if [[ $i == *.patch ]]; then
+      patch -F100 -p1 -i "${srcdir}/${i}"
+    fi
+  done
+}
+
+build() {
+  cd ${srcdir}/Remmina-$pkgver/
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DWITH_APPINDICATOR=OFF .
+  make
+}
+
+package() {
+  cd ${srcdir}/Remmina-$pkgver/
+  make DESTDIR=${pkgdir} install
+  rm -rf $pkgdir/build
+}

Deleted: community-x86_64/freerdp-1.2.patch
===================================================================
--- community-x86_64/freerdp-1.2.patch	2014-12-09 11:55:04 UTC (rev 123679)
+++ community-x86_64/freerdp-1.2.patch	2014-12-09 11:55:19 UTC (rev 123680)
@@ -1,53 +0,0 @@
-diff -wbBur Remmina-1.1.1/cmake/FindFREERDP.cmake Remmina-1.1.1.my/cmake/FindFREERDP.cmake
---- Remmina-1.1.1/cmake/FindFREERDP.cmake	2014-10-10 16:25:23.000000000 +0400
-+++ Remmina-1.1.1.my/cmake/FindFREERDP.cmake	2014-11-19 19:32:40.112459977 +0300
-@@ -24,19 +24,7 @@
- find_path(FREERDP_INCLUDE_DIR NAMES freerdp/freerdp.h
- 	HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS})
- 
--find_library(FREERDP_LIBRARY NAMES freerdp-core
--	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_GDI_LIBRARY NAMES freerdp-gdi
--	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_LOCALE_LIBRARY NAMES freerdp-locale
--	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_RAIL_LIBRARY NAMES freerdp-rail
--	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_CODEC_LIBRARY NAMES freerdp-codec
-+find_library(FREERDP_LIBRARY NAMES freerdp
- 	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
- 
- find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client
-@@ -46,7 +34,7 @@
- 
- find_package_handle_standard_args(FREERDP DEFAULT_MSG FREERDP_LIBRARY FREERDP_INCLUDE_DIR)
- 
--set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_GDI_LIBRARY} ${FREERDP_LOCALE_LIBRARY} ${FREERDP_RAIL_LIBRARY} ${FREERDP_CODEC_LIBRARY} ${FREERDP_CLIENT_LIBRARY})
-+set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_CLIENT_LIBRARY})
- set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR})
- 
- mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY)
-diff -wbBur Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c
---- Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c	2014-10-10 16:25:23.000000000 +0400
-+++ Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c	2014-11-19 19:36:32.241877093 +0300
-@@ -257,7 +257,7 @@
- 		settings->LargePointerFlag = True;
- 		settings->PerformanceFlags = PERF_FLAG_NONE;
- 
--		rfi->rfx_context = rfx_context_new();
-+		rfi->rfx_context = rfx_context_new(FALSE);
- 	}
- 
- 	freerdp_client_load_addins(instance->context->channels, instance->settings);
-@@ -1198,7 +1198,6 @@
- 
- 	remmina_rdp_settings_init();
- 	freerdp_handle_signals();
--	freerdp_channels_global_init();
- 
- 	return TRUE;
- }

Copied: remmina/repos/community-x86_64/freerdp-1.2.patch (from rev 123679, remmina/trunk/freerdp-1.2.patch)
===================================================================
--- community-x86_64/freerdp-1.2.patch	                        (rev 0)
+++ community-x86_64/freerdp-1.2.patch	2014-12-09 11:55:19 UTC (rev 123680)
@@ -0,0 +1,53 @@
+diff -wbBur Remmina-1.1.1/cmake/FindFREERDP.cmake Remmina-1.1.1.my/cmake/FindFREERDP.cmake
+--- Remmina-1.1.1/cmake/FindFREERDP.cmake	2014-10-10 16:25:23.000000000 +0400
++++ Remmina-1.1.1.my/cmake/FindFREERDP.cmake	2014-11-19 19:32:40.112459977 +0300
+@@ -24,19 +24,7 @@
+ find_path(FREERDP_INCLUDE_DIR NAMES freerdp/freerdp.h
+ 	HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS})
+ 
+-find_library(FREERDP_LIBRARY NAMES freerdp-core
+-	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+-
+-find_library(FREERDP_GDI_LIBRARY NAMES freerdp-gdi
+-	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+-
+-find_library(FREERDP_LOCALE_LIBRARY NAMES freerdp-locale
+-	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+-
+-find_library(FREERDP_RAIL_LIBRARY NAMES freerdp-rail
+-	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+-
+-find_library(FREERDP_CODEC_LIBRARY NAMES freerdp-codec
++find_library(FREERDP_LIBRARY NAMES freerdp
+ 	HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+ 
+ find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client
+@@ -46,7 +34,7 @@
+ 
+ find_package_handle_standard_args(FREERDP DEFAULT_MSG FREERDP_LIBRARY FREERDP_INCLUDE_DIR)
+ 
+-set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_GDI_LIBRARY} ${FREERDP_LOCALE_LIBRARY} ${FREERDP_RAIL_LIBRARY} ${FREERDP_CODEC_LIBRARY} ${FREERDP_CLIENT_LIBRARY})
++set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_CLIENT_LIBRARY})
+ set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR})
+ 
+ mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY)
+diff -wbBur Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c
+--- Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c	2014-10-10 16:25:23.000000000 +0400
++++ Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c	2014-11-19 19:36:32.241877093 +0300
+@@ -257,7 +257,7 @@
+ 		settings->LargePointerFlag = True;
+ 		settings->PerformanceFlags = PERF_FLAG_NONE;
+ 
+-		rfi->rfx_context = rfx_context_new();
++		rfi->rfx_context = rfx_context_new(FALSE);
+ 	}
+ 
+ 	freerdp_client_load_addins(instance->context->channels, instance->settings);
+@@ -1198,7 +1198,6 @@
+ 
+ 	remmina_rdp_settings_init();
+ 	freerdp_handle_signals();
+-	freerdp_channels_global_init();
+ 
+ 	return TRUE;
+ }

Deleted: community-x86_64/remmina.install
===================================================================
--- community-x86_64/remmina.install	2014-12-09 11:55:04 UTC (rev 123679)
+++ community-x86_64/remmina.install	2014-12-09 11:55:19 UTC (rev 123680)
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: remmina/repos/community-x86_64/remmina.install (from rev 123679, remmina/trunk/remmina.install)
===================================================================
--- community-x86_64/remmina.install	                        (rev 0)
+++ community-x86_64/remmina.install	2014-12-09 11:55:19 UTC (rev 123680)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: community-x86_64/vte2.91.patch
===================================================================
--- community-x86_64/vte2.91.patch	2014-12-09 11:55:04 UTC (rev 123679)
+++ community-x86_64/vte2.91.patch	2014-12-09 11:55:19 UTC (rev 123680)
@@ -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);



More information about the arch-commits mailing list