[arch-commits] Commit in freerdp/trunk (2 files)

[David Runge]

    Date: Thursday, January 30, 2020 @ 10:06:38
  Author: dvzrv
Revision: 560105

upgpkg: freerdp 1:2.0.0_rc4-8: Adding a patch to fix man page generation (FS#64814). Adding all direct library sodeps in package(). Simplifying cmake/ make calls. Installing additional docs.

Added:
  freerdp/trunk/freerdp-2.0.0-manpage_formatting.patch
Modified:
  freerdp/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   38 +++++++++++++++++++------------
 freerdp-2.0.0-manpage_formatting.patch |   12 +++++++++
 2 files changed, 36 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-30 10:02:38 UTC (rev 560104)
+++ PKGBUILD	2020-01-30 10:06:38 UTC (rev 560105)
@@ -1,5 +1,5 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: David Runge <dave at sleepmap.de>
+# Contributor: David Runge <dvzrv at archlinux.org>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 _name=FreeRDP
@@ -6,28 +6,34 @@
 pkgname=freerdp
 epoch=1
 pkgver=2.0.0_rc4
-pkgrel=7
+pkgrel=8
 pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
 arch=('x86_64')
 url="http://www.freerdp.com/"
 license=('Apache')
-depends=('dbus-glib' 'faac' 'faad2' 'ffmpeg' 'gst-plugins-base-libs' 'libcups'
-'libgssglue' 'libxkbcommon' 'libxinerama' 'libxkbfile' 'libxrandr' 'mbedtls'
-'pcsclite')
-makedepends=('cmake' 'docbook-xsl' 'krb5' 'xmlto' 'xorgproto')
+depends=('dbus-glib' 'glib2' 'glibc' 'gsm' 'gstreamer' 'gst-plugins-base-libs'
+'lame' 'libcups' 'libjpeg-turbo' 'libgssglue' 'libsoxr' 'libusb' 'libxkbcommon'
+'libxinerama' 'libxkbfile' 'libxrandr' 'mbedtls' 'openssl' 'pam' 'pcsclite'
+'wayland')
+makedepends=('alsa-lib' 'cmake' 'docbook-xsl' 'faac' 'faad2' 'ffmpeg' 'krb5'
+'libpulse' 'systemd-libs' 'xmlto' 'xorgproto')
 provides=('libwinpr-tools2.so' 'libfreerdp-client2.so' 'libfreerdp2.so'
 'libwinpr2.so')
-source=($pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver/_/-}.tar.gz)
-sha256sums=('3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver/_/-}.tar.gz"
+        "$pkgname-2.0.0-manpage_formatting.patch")
+sha512sums=('b4a4d4a58d09010bc45fb90cca148dc4421a4cf0cd5caf288aa702212ef081f14fc418b91f1b79ec8631f582c9ebcdd3031d3333b6a892adb29c402492abb649'
+            'd960e042d1527b5d5721136b6b20fc36f65beafd010581ea5b908668537fe9fe622de6689a29c0274b0d6f1e513615f0d02e56c1d1d1e613d093e145d39af8d7')
 
 prepare() {
   mv -v "${_name}-${pkgver/_/-}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
-  mkdir -pv build
+  # fix man page formatting:
+  # https://bugs.archlinux.org/task/64814
+  patch -Np1 -i "../${pkgname}-2.0.0-manpage_formatting.patch"
 }
 
 build() {
-  cd "${pkgname}-${pkgver}/build"
+  cd "${pkgname}-${pkgver}"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DWITH_MBEDTLS=ON \
@@ -45,11 +51,15 @@
         -DWITH_CLIENT_CHANNELS=ON \
         -DWITH_SERVER_CHANNELS=ON \
         -DCHANNEL_URBDRC_CLIENT=ON \
-        ..
-  make VERBOSE=1
+        -B build \
+        -S .
+  make VERBOSE=1 -C build
 }
 
 package() {
-  cd "${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
+  depends+=('libasound.so' 'libavcodec.so' 'libavutil.so' 'libfaac.so'
+  'libfaad.so' 'libpulse.so' 'libsystemd.so' 'libudev.so')
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install -C build
+  install -vDm 644 {ChangeLog,README} -t "${pkgdir}/usr/share/doc/${pkgname}"
 }

Added: freerdp-2.0.0-manpage_formatting.patch
===================================================================
--- freerdp-2.0.0-manpage_formatting.patch	                        (rev 0)
+++ freerdp-2.0.0-manpage_formatting.patch	2020-01-30 10:06:38 UTC (rev 560105)
@@ -0,0 +1,12 @@
+diff -ruN a/cmake/FindDocBookXSL.cmake b/cmake/FindDocBookXSL.cmake
+--- a/cmake/FindDocBookXSL.cmake	2018-11-20 11:43:51.000000000 +0100
++++ b/cmake/FindDocBookXSL.cmake	2020-01-30 10:37:44.827482448 +0100
+@@ -30,7 +30,7 @@
+    set (STYLESHEET_PATH_LIST)
+    foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH})
+       file(GLOB STYLESHEET_SUFFIX_ITER RELATIVE ${STYLESHEET_PREFIX_ITER}
+-           ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-*
++           ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-*-nons
+       )
+       if (STYLESHEET_SUFFIX_ITER)
+          list (APPEND STYLESHEET_PATH_LIST ${STYLESHEET_SUFFIX_ITER})