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

Sergej Pupykin spupykin at archlinux.org
Tue Mar 3 12:32:46 UTC 2015


    Date: Tuesday, March 3, 2015 @ 13:32:46
  Author: spupykin
Revision: 128618

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

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

------------------------------------+
 /PKGBUILD                          |  106 +++++++++++++++++++++++++++++++++++
 /remmina.install                   |   22 +++++++
 community-i686/PKGBUILD            |   41 -------------
 community-i686/freerdp-1.2.patch   |   53 +++++++++++++++++
 community-i686/remmina.install     |   11 ---
 community-x86_64/PKGBUILD          |   41 -------------
 community-x86_64/freerdp-1.2.patch |   53 +++++++++++++++++
 community-x86_64/remmina.install   |   11 ---
 8 files changed, 234 insertions(+), 104 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-03-03 12:32:31 UTC (rev 128617)
+++ community-i686/PKGBUILD	2015-03-03 12:32:46 UTC (rev 128618)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=remmina
-pkgver=1.2.0rcgit.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/rc/-rc}.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/rc/-rc}.tar.gz")
-md5sums=('049fc8d428e84bcbe7cac653e4447cd7')
-
-build() {
-  cd ${srcdir}/Remmina-${pkgver/rc/-rc}/
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DWITH_APPINDICATOR=OFF .
-  make
-}
-
-package() {
-  cd ${srcdir}/Remmina-${pkgver/rc/-rc}/
-  make DESTDIR=${pkgdir} install
-  rm -rf $pkgdir/build
-}

Copied: remmina/repos/community-i686/PKGBUILD (from rev 128617, remmina/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-03-03 12:32:46 UTC (rev 128618)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=remmina
+epoch=1
+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
+}

Copied: remmina/repos/community-i686/freerdp-1.2.patch (from rev 128617, remmina/trunk/freerdp-1.2.patch)
===================================================================
--- community-i686/freerdp-1.2.patch	                        (rev 0)
+++ community-i686/freerdp-1.2.patch	2015-03-03 12:32:46 UTC (rev 128618)
@@ -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	2015-03-03 12:32:31 UTC (rev 128617)
+++ community-i686/remmina.install	2015-03-03 12:32:46 UTC (rev 128618)
@@ -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 128617, remmina/trunk/remmina.install)
===================================================================
--- community-i686/remmina.install	                        (rev 0)
+++ community-i686/remmina.install	2015-03-03 12:32:46 UTC (rev 128618)
@@ -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/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-03-03 12:32:31 UTC (rev 128617)
+++ community-x86_64/PKGBUILD	2015-03-03 12:32:46 UTC (rev 128618)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=remmina
-pkgver=1.2.0rcgit.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/rc/-rc}.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/rc/-rc}.tar.gz")
-md5sums=('049fc8d428e84bcbe7cac653e4447cd7')
-
-build() {
-  cd ${srcdir}/Remmina-${pkgver/rc/-rc}/
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DWITH_APPINDICATOR=OFF .
-  make
-}
-
-package() {
-  cd ${srcdir}/Remmina-${pkgver/rc/-rc}/
-  make DESTDIR=${pkgdir} install
-  rm -rf $pkgdir/build
-}

Copied: remmina/repos/community-x86_64/PKGBUILD (from rev 128617, remmina/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-03-03 12:32:46 UTC (rev 128618)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=remmina
+epoch=1
+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
+}

Copied: remmina/repos/community-x86_64/freerdp-1.2.patch (from rev 128617, remmina/trunk/freerdp-1.2.patch)
===================================================================
--- community-x86_64/freerdp-1.2.patch	                        (rev 0)
+++ community-x86_64/freerdp-1.2.patch	2015-03-03 12:32:46 UTC (rev 128618)
@@ -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	2015-03-03 12:32:31 UTC (rev 128617)
+++ community-x86_64/remmina.install	2015-03-03 12:32:46 UTC (rev 128618)
@@ -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 128617, remmina/trunk/remmina.install)
===================================================================
--- community-x86_64/remmina.install	                        (rev 0)
+++ community-x86_64/remmina.install	2015-03-03 12:32:46 UTC (rev 128618)
@@ -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
+}



More information about the arch-commits mailing list