[arch-commits] Commit in (4 files)

Sergej Pupykin spupykin at archlinux.org
Fri Feb 27 16:22:08 UTC 2015 

    Date: Friday, February 27, 2015 @ 17:22:08
  Author: spupykin
Revision: 128387

Modified:
  freerdp/trunk/PKGBUILD
  remmina/trunk/PKGBUILD
Deleted:
  freerdp/trunk/build-fix.patch
  remmina/trunk/freerdp-1.2.patch

---------------------------------+
 freerdp/trunk/PKGBUILD          |   14 +++++-----
 freerdp/trunk/build-fix.patch   |   13 ---------
 remmina/trunk/PKGBUILD          |   21 +++------------
 remmina/trunk/freerdp-1.2.patch |   53 --------------------------------------
 4 files changed, 12 insertions(+), 89 deletions(-)

Modified: freerdp/trunk/PKGBUILD
===================================================================
--- freerdp/trunk/PKGBUILD	2015-02-27 16:21:40 UTC (rev 128386)
+++ freerdp/trunk/PKGBUILD	2015-02-27 16:22:08 UTC (rev 128387)
@@ -3,10 +3,10 @@
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=freerdp
-pkgver=1.2.0_beta1+android9
+pkgver=1.2.0_beta1+20150227
 _pkgver=${pkgver/_/-}
 _pkgver=${_pkgver/+/-}
-pkgrel=3
+pkgrel=4
 pkgdesc="Free RDP client"
 arch=('i686' 'x86_64')
 url="http://freerdp.sourceforge.net"
@@ -17,14 +17,13 @@
 makedepends=('krb5' 'cmake' 'damageproto' 'fixesproto' 'renderproto'
 	     'xmlto' 'docbook-xsl')
 conflicts=('freerdp-git')
-source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/${pkgver/_/-}.tar.gz
-	build-fix.patch)
-md5sums=('a4a0a4f6e69c871aeab0600091ca6118'
-         '9e9488538fe5ab74c25e2fb69e3edf62')
+#source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/${pkgver/_/-}.tar.gz
+source=(FreeRDP-${_pkgver}::git://github.com/FreeRDP/FreeRDP.git#commit=ff6dbb049ce066f6fca5708f81fd33f97086bc0e)
+md5sums=('SKIP')
 
 prepare() {
   cd $srcdir/FreeRDP-${_pkgver}
-  patch -p1 <$srcdir/build-fix.patch
+#  patch -p1 <$srcdir/build-fix.patch
 }
 
 build() {
@@ -36,6 +35,7 @@
 	-DWITH_CUPS=ON \
 	-DWITH_CHANNELS=ON \
 	-DWITH_CLIENT_CHANNELS=ON \
+	-DWITH_SERVER_CHANNELS=ON \
 	.
   make
 }

Deleted: freerdp/trunk/build-fix.patch
===================================================================
--- freerdp/trunk/build-fix.patch	2015-02-27 16:21:40 UTC (rev 128386)
+++ freerdp/trunk/build-fix.patch	2015-02-27 16:22:08 UTC (rev 128387)
@@ -1,13 +0,0 @@
-diff -wbBur FreeRDP-1.2.0-beta1-android9/channels/client/CMakeLists.txt FreeRDP-1.2.0-beta1-android9.my/channels/client/CMakeLists.txt
---- FreeRDP-1.2.0-beta1-android9/channels/client/CMakeLists.txt	2014-09-12 02:46:32.000000000 +0400
-+++ FreeRDP-1.2.0-beta1-android9.my/channels/client/CMakeLists.txt	2015-02-25 14:05:27.840874974 +0300
-@@ -24,7 +24,9 @@
- 	${CMAKE_CURRENT_SOURCE_DIR}/addin.c
- 	${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
- 
-+if(CHANNEL_STATIC_CLIENT_ENTRIES)
- list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
-+endif()
- 
- foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
- 	foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})

Modified: remmina/trunk/PKGBUILD
===================================================================
--- remmina/trunk/PKGBUILD	2015-02-27 16:21:40 UTC (rev 128386)
+++ remmina/trunk/PKGBUILD	2015-02-27 16:22:08 UTC (rev 128387)
@@ -2,7 +2,7 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=remmina
-pkgver=1.1.2
+pkgver=1.2.0rcgit.2
 pkgrel=1
 pkgdesc="remote desktop client written in GTK+"
 arch=(i686 x86_64)
@@ -22,22 +22,11 @@
 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')
+source=("$pkgname-${pkgver/rc/-rc}.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/rc/-rc}.tar.gz")
+md5sums=('049fc8d428e84bcbe7cac653e4447cd7')
 
-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/
+  cd ${srcdir}/Remmina-${pkgver/rc/-rc}/
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
@@ -46,7 +35,7 @@
 }
 
 package() {
-  cd ${srcdir}/Remmina-$pkgver/
+  cd ${srcdir}/Remmina-${pkgver/rc/-rc}/
   make DESTDIR=${pkgdir} install
   rm -rf $pkgdir/build
 }

Deleted: remmina/trunk/freerdp-1.2.patch
===================================================================
--- remmina/trunk/freerdp-1.2.patch	2015-02-27 16:21:40 UTC (rev 128386)
+++ remmina/trunk/freerdp-1.2.patch	2015-02-27 16:22:08 UTC (rev 128387)
@@ -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;
- }

More information about the arch-commits mailing list