upgrade to new build format

.gitignore

-trunk/@BASE@*
-trunk/pkg/
-trunk/src/
-trunk/*.pkg.tar.xz
-trunk/*.pkg.tar.xz.sig
-version/*/bin/
+a
+b
+patch-prepare.sh
+patch-make.sh
\ No newline at end of file

.gitlab-ci.yml

+.job_variables: &job_variables
+  variables:
+    GIT_SUBMODULE_STRATEGY: none
+    GIT_DEPTH: 0
+    PKG_TOKEN: ${PKG_TOKEN}
+
+.job_rules_push: &job_rules_push
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG == null'
+
+.job_rules_schedule: &job_rules_schedule
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+
+.job_rules_web: &job_rules_web
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+
+.job_rules_pipeline: &job_rules_pipeline
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "pipeline"'
+
+.copy_files: &copy_files
+    before_script:
+      - mkdir -p /etc/pkg
+      - cp ./pkg.cfg /etc/pkg/pkg.cfg
+      - cp ./pacman.conf.builder /etc/pacman.conf.builder
+
 stages:
-    - build
-    - commit
-    - deploy
+  - update
+  - build
+  - rebuild
+  - deploy
 
-package:
-  stage: build
+update:
+  stage: update
+  <<: *job_variables
+  <<: *job_rules_schedule
+  <<: *copy_files
   script:
-    - mkdir -p /etc/pkg
-    - cp ./pkg.cfg /etc/pkg/pkg.cfg
-    - cp ./pacman.conf.builder /etc/pacman.conf.builder
-    - pkg-prepare.sh
-    - pkg-build.sh --chdir=trunk $CI_PROJECT_DIR
+    - apkg-update.sh
 
+build:
+  stage: build
+  <<: *job_variables
+  <<: *job_rules_push
+  <<: *copy_files
+  script:
+    - apkg-prepare.sh
+    - apkg-build.sh
+    - apkg-tag.sh
   artifacts:
-    name: $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
+    name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
     paths:
-     - "*.pkg.tar.xz"
+      - "*.pkg.tar.xz"
+      - build.env
 
-  only:
-    changes:
-      - trunk/PKGBUILD
-
-commit:
-  stage: commit
-  only:
-    changes:
-      - trunk/PKGBUILD
+rebuild:from:
+  stage: rebuild
+  <<: *job_variables
+  <<: *job_rules_pipeline
+  <<: *copy_files
+  script:
+    - apkg-rebuild.sh
+  artifacts:
+    name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
+    paths:
+      - "*.pkg.tar.xz"
 
+rebuild:dynamic:
+  stage: rebuild
+  <<: *job_rules_push
+  <<: *copy_files
+  needs: ["build"]
   script:
-    - pkg-commit.sh
+    - apkg-generate.sh > dynamic-config.yml
+  artifacts:
+    paths:
+      - dynamic-config.yml
+
+rebuild:packages:
+  stage: rebuild
+  <<: *job_variables
+  <<: *job_rules_push
+  needs: ["rebuild:dynamic","build"]
+  trigger:
+    include:
+      - artifact: dynamic-config.yml
+        job: rebuild:dynamic
+    strategy: depend
 
 deploy:
+  <<: *job_variables
+  <<: *job_rules_push
   stage: deploy
-  dependencies:
-    - package
+  needs: ["build","rebuild:packages"]
   script:
-    - pkg-deploy.sh
-
-  only:
-    changes:
-      - trunk/PKGBUILD
+    - apkg-deploy.sh

.gitmodules

+[submodule "freerdp"]
+	path = freerdp
+	url = https://gitlab.archlinux.org/archlinux/packaging/packages/freerdp
+	branch = main
+    update = merge

LICENSE

+Copyright (c) 2023 Eric Vidal <eric@obarun.org>
+All rights reserved.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

diff/patch/PKG.patch

+diff -uar a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD
++++ b/PKGBUILD
+@@ -41,7 +41,6 @@
+   libusb
+   openssl
+   pam
+-  systemd
+   xmlto
+   xorgproto
+ )
+@@ -88,6 +87,7 @@
+     -DWITH_CLIENT_CHANNELS=ON
+     -DWITH_SERVER_CHANNELS=ON
+     -DCHANNEL_URBDRC_CLIENT=ON
++    -DWITH_LIBSYSTEMD=OFF
+     -Wno-dev
+     -B build
+     -S $_name-$pkgver
+@@ -111,7 +111,6 @@
+     libusb libusb-1.0.so
+     openssl libcrypto.so libssl.so
+     pam libpam.so
+-    systemd-libs libsystemd.so
+   )
+ 
+   DESTDIR="$pkgdir" cmake --install build

freerdp @ 3251ef09

+Subproject commit 3251ef090faf3e6ded2868275251b5851dc886f3

pacman.conf.builder

@@ -5,11 +5,9 @@
 [options]
 HoldPkg     = pacman glibc
 Architecture = auto
-IgnorePkg   = systemd
-IgnorePkg   = systemd-libs
-NoExtract   = usr/lib/libsystemd*.*
+IgnorePkg   = systemd systemd-libs
+NoExtract   = usr/lib/libsystemd*.* usr/lib/systemd* etc/systemd*
 Color
-CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
 #XferCommand =
@@ -33,22 +31,6 @@ Server = https://cloud.server.obarun.org/$repo/os/$arch/
 SigLevel = Required
 Server = https://cloud.server.obarun.org/$repo/os/$arch/
 
-#[obcommunity-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obcommunity]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[obmultilib-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obmultilib]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
 #[observice-testing]
 #SigLevel = Required
 #Server = https://cloud.server.obarun.org/$repo/os/$arch/
@@ -57,23 +39,18 @@ Server = https://cloud.server.obarun.org/$repo/os/$arch/
 SigLevel = Required
 Server = https://cloud.server.obarun.org/$repo/os/$arch/
 
-#[testing]
+#[core-testing]
+#SigLevel = DatabaseOptional
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
+SigLevel = DatabaseOptional
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
+#[extra-testing]
+#SigLevel = DatabaseOptional
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
+[extra]
+SigLevel = DatabaseOptional
 Include = /etc/pacman.d/mirrorlist
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist

pkg.cfg

 # Options passed to makepkg
 makepkg_opts=( "--noconfirm" "--nosign" "--syncdeps" "--rmdeps" "--clean" "--cleanbuild" )
+MAKEFLAGS="-j3"

trunk/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obcommunity/freerdp
-#----------------
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-_name=FreeRDP
-pkgname=freerdp
-pkgver=2.11.2
-pkgrel=2
-epoch=2
-pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
-
-url='https://github.com/freerdp/freerdp'
-
-track=$pkgname/$pkgname/archive/${pkgver}
-target=${pkgname}-${pkgver}
-source=(
-    https://github.com/$track/$target.tar.gz
-    $pkgname-2.0.0-manpage_formatting.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'alsa-lib'
-    'cmake'
-    'docbook-xsl'
-    'ffmpeg'
-    'icu'
-    'krb5'
-    'libjpeg-turbo'
-    'libpulse'
-    'libusb'
-    'openssl'
-    'pam'
-    'xmlto'
-    'xorgproto'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'glibc'
-    'libcups'
-    'libx11'
-    'libxcursor'
-    'libxext'
-    'libxdamage'
-    'libxfixes'
-    'libxkbcommon'
-    'libxi'
-    'libxinerama'
-    'libxkbfile'
-    'libxrandr'
-    'libxrender'
-    'libxtst'
-    'pcsclite'
-    'wayland'
-)
-
-provides=(
-    'libfreerdp2.so'
-    'libfreerdp-client2.so'
-    'libfreerdp-server2'
-    'libfreerdp-shadow2.so'
-    'libfreerdp-shadow-subsystem2.so'
-    'libwinpr2.so'
-    'libwinpr-tools2.so'
-    'libuwac0.so'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-
-    ## fix man page formatting:
-    ## https://bugs.archlinux.org/task/64814
-    patch -d $_name-$pkgver -p1 -i ../$pkgname-2.0.0-manpage_formatting.patch
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-)
-
-_flags=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-    -DCMAKE_BUILD_TYPE=None
-    -DCMAKE_SKIP_INSTALL_RPATH=ON
-    -DPROXY_PLUGINDIR=/usr/lib/freerdp2/server/proxy/plugins
-    -DWITH_DSP_FFMPEG=ON
-    -DWITH_FFMPEG=ON
-    -DWITH_PULSE=ON
-    -DWITH_CUPS=ON
-    -DWITH_PCSC=ON
-    -DWITH_ICU=ON
-    -DWITH_JPEG=ON
-    -DWITH_SERVER=ON
-    -DWITH_SWSCALE=ON
-    -DWITH_CHANNELS=ON
-    -DWITH_CLIENT_CHANNELS=ON
-    -DWITH_SERVER_CHANNELS=ON
-    -DCHANNEL_URBDRC_CLIENT=ON
-    -Wno-dev
-    -DWITH_LIBSYSTEMD=OFF
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    cmake "${_path[@]}" "${_flags[@]}" -B build -S $_name-$pkgver
-    cmake --build build --verbose
-}
-
-#--------
-# CHECK ]
-
-check() {
-  ctest --test-dir build --output-on-failure
-}
-
-#----------
-# PACKAGE ]
-
-package() {
-    depends+=(
-        alsa-lib libasound.so
-        ffmpeg libavcodec.so libavutil.so libswresample.so libswscale.so
-        icu libicuuc.so
-        libjpeg-turbo libjpeg.so
-        libpulse libpulse.so
-        libusb libusb-1.0.so
-        openssl libcrypto.so libssl.so
-        pam libpam.so
-    )
-
-    DESTDIR="$pkgdir" cmake --install build
-    install -vDm 644 $_name-$pkgver/{ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-arch=(x86_64)
-license=(Apache)
-
-sha512sums=(' ')

trunk/freerdp-2.0.0-manpage_formatting.patch

-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})

version/2.0.0_rc4-9/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Website       : http://www.freerdp.com/
-#--------------------------------------------------------------------------------------
-
-pkgname=freerdp
-pkgver=2.0.0_rc4
-pkgrel=9
-epoch=1
-pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
-arch=('x86_64')
-url="https://github.com/FreeRDP/FreeRDP"
-license=('Apache')
-
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver/_/-}.tar.gz"
-        "${pkgname}-2.0.0-manpage_formatting.patch")
-        
-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'
-    'xmlto'
-    'xorgproto')
-
-provides=(
-    'libwinpr-tools2.so'
-    'libfreerdp-client2.so'
-    'libfreerdp2.so'
-    'libwinpr2.so')
-
-#--BUILDER-CONTROL---------------------------------------------------------------------
-
-path=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-)
-
-flags=(
-    -DWITH_MBEDTLS=ON
-    -DWITH_PULSE=ON
-    -DWITH_CUPS=ON
-    -DWITH_PCSC=ON
-    -DWITH_JPEG=ON
-    -DWITH_GSM=ON
-    -DWITH_LAME=ON
-    -DWITH_FAAD2=ON
-    -DWITH_FAAC=ON
-    -DWITH_SOXR=ON
-    -DWITH_SERVER=ON
-    -DWITH_CHANNELS=ON
-    -DWITH_CLIENT_CHANNELS=ON
-    -DWITH_SERVER_CHANNELS=ON
-    -DCHANNEL_URBDRC_CLIENT=ON
-    -DWITH_LIBSYSTEMD=OFF
-)
-
-#--------------------------------------------------------------------------------------
-prepare() {
-    mv -v "FreeRDP-${pkgver/_/-}" "${pkgname}-${pkgver}"
-    cd "${pkgname}-${pkgver}"
-
-    ## fix man page formatting:
-    ## https://bugs.archlinux.org/task/64814
-    patch -Np1 -i "../${pkgname}-2.0.0-manpage_formatting.patch"
-}
-
-build() {
-    cd "${pkgname}-${pkgver}"
-    cmake "${path[@]}" "${flags[@]}" -B build -S .
-    make VERBOSE=1 -C build
-}
-
-package() {
-    depends+=(
-        'libasound.so'
-        'libavcodec.so'
-        'libavutil.so'
-        'libfaac.so'
-        'libfaad.so'
-        'libpulse.so'
-        'libudev.so')
-
-    cd "${pkgname}-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install -C build
-    install -vDm 644 {ChangeLog,README} -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
-
-#-----------------------------------------------------------------------------------------------
-sha512sums=('b4a4d4a58d09010bc45fb90cca148dc4421a4cf0cd5caf288aa702212ef081f14fc418b91f1b79ec8631f582c9ebcdd3031d3333b6a892adb29c402492abb649'
-            'd960e042d1527b5d5721136b6b20fc36f65beafd010581ea5b908668537fe9fe622de6689a29c0274b0d6f1e513615f0d02e56c1d1d1e613d093e145d39af8d7')

version/2.0.0_rc4-9/freerdp-2.0.0-manpage_formatting.patch

-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})

version/2.10.0-2/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obcommunity/freerdp
-#----------------
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-_name=FreeRDP
-pkgname=freerdp
-pkgver=2.10.0
-pkgrel=2
-epoch=2
-pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
-
-url='https://github.com/freerdp/freerdp'
-
-track=$pkgname/$pkgname/archive/${pkgver}
-target=${pkgname}-${pkgver}
-source=(
-    https://github.com/$track/$target.tar.gz
-    $pkgname-2.0.0-manpage_formatting.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'alsa-lib'
-    'cmake'
-    'docbook-xsl'
-    'ffmpeg'
-    'icu'
-    'krb5'
-    'libjpeg-turbo'
-    'libpulse'
-    'libusb'
-    'openssl'
-    'pam'
-    'xmlto'
-    'xorgproto'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'dbus-glib'
-    'glibc'
-    'gstreamer'
-    'gst-plugins-base-libs'
-    'libcups'
-    'libgssglue'
-    'libx11'
-    'libxcursor'
-    'libxext'
-    'libxdamage'
-    'libxfixes'
-    'libxkbcommon'
-    'libxi'
-    'libxinerama'
-    'libxkbfile'
-    'libxrandr'
-    'libxrender'
-    'libxtst'
-    'pcsclite'
-    'wayland'
-)
-
-provides=(
-    'libfreerdp2.so'
-    'libfreerdp-client2.so'
-    'libfreerdp-server2'
-    'libfreerdp-shadow2.so'
-    'libfreerdp-shadow-subsystem2.so'
-    'libwinpr2.so'
-    'libwinpr-tools2.so'
-    'libuwac0.so'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-
-    ## fix man page formatting:
-    ## https://bugs.archlinux.org/task/64814
-    patch -d $_name-$pkgver -p1 -i ../$pkgname-2.0.0-manpage_formatting.patch
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-)
-
-_flags=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-    -DCMAKE_BUILD_TYPE=None
-    -DCMAKE_SKIP_INSTALL_RPATH=ON
-    -DPROXY_PLUGINDIR=/usr/lib/freerdp2/server/proxy/plugins
-    -DWITH_DSP_FFMPEG=ON
-    -DWITH_FFMPEG=ON
-    -DWITH_PULSE=ON
-    -DWITH_CUPS=ON
-    -DWITH_PCSC=ON
-    -DWITH_ICU=ON
-    -DWITH_JPEG=ON
-    -DWITH_SERVER=ON
-    -DWITH_SWSCALE=ON
-    -DWITH_CHANNELS=ON
-    -DWITH_CLIENT_CHANNELS=ON
-    -DWITH_SERVER_CHANNELS=ON
-    -DCHANNEL_URBDRC_CLIENT=ON
-    -Wno-dev
-    -DWITH_LIBSYSTEMD=OFF
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    cmake "${_path[@]}" "${_flags[@]}" -B build -S $_name-$pkgver
-    cmake --build build --verbose
-}
-
-#--------
-# CHECK ]
-
-check() {
-  ctest --test-dir build --output-on-failure
-}
-
-#----------
-# PACKAGE ]
-
-package() {
-    depends+=(
-        alsa-lib libasound.so
-        ffmpeg libavcodec.so libavutil.so libswresample.so libswscale.so
-        icu libicuuc.so
-        libjpeg-turbo libjpeg.so
-        libpulse libpulse.so
-        libusb libusb-1.0.so
-        openssl libcrypto.so libssl.so
-        pam libpam.so
-    )
-
-    DESTDIR="$pkgdir" cmake --install build
-    install -vDm 644 $_name-$pkgver/{ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-arch=(x86_64)
-license=(Apache)
-
-sha512sums=(' ')

version/2.10.0-2/freerdp-2.0.0-manpage_formatting.patch

-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})

version/2.10.0-3/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obcommunity/freerdp
-#----------------
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-_name=FreeRDP
-pkgname=freerdp
-pkgver=2.10.0
-pkgrel=3
-epoch=2
-pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
-
-url='https://github.com/freerdp/freerdp'
-
-track=$pkgname/$pkgname/archive/${pkgver}
-target=${pkgname}-${pkgver}
-source=(
-    https://github.com/$track/$target.tar.gz
-    $pkgname-2.0.0-manpage_formatting.patch
-	https://github.com/FreeRDP/FreeRDP/commit/aa2cb9aa.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'alsa-lib'
-    'cmake'
-    'docbook-xsl'
-    'ffmpeg'
-    'icu'
-    'krb5'
-    'libjpeg-turbo'
-    'libpulse'
-    'libusb'
-    'openssl'
-    'pam'
-    'xmlto'
-    'xorgproto'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'dbus-glib'
-    'glibc'
-    'gstreamer'
-    'gst-plugins-base-libs'
-    'libcups'
-    'libgssglue'
-    'libx11'
-    'libxcursor'
-    'libxext'
-    'libxdamage'
-    'libxfixes'
-    'libxkbcommon'
-    'libxi'
-    'libxinerama'
-    'libxkbfile'
-    'libxrandr'
-    'libxrender'
-    'libxtst'
-    'pcsclite'
-    'wayland'
-)
-
-provides=(
-    'libfreerdp2.so'
-    'libfreerdp-client2.so'
-    'libfreerdp-server2'
-    'libfreerdp-shadow2.so'
-    'libfreerdp-shadow-subsystem2.so'
-    'libwinpr2.so'
-    'libwinpr-tools2.so'
-    'libuwac0.so'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-
-    ## fix man page formatting:
-    ## https://bugs.archlinux.org/task/64814
-    patch -d $_name-$pkgver -p1 -i ../$pkgname-2.0.0-manpage_formatting.patch
-	patch -d $_name-$pkgver -p1 -i ../aa2cb9aa.patch # Fix build with FFmpeg 6
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-)
-
-_flags=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-    -DCMAKE_BUILD_TYPE=None
-    -DCMAKE_SKIP_INSTALL_RPATH=ON
-    -DPROXY_PLUGINDIR=/usr/lib/freerdp2/server/proxy/plugins
-    -DWITH_DSP_FFMPEG=ON
-    -DWITH_FFMPEG=ON
-    -DWITH_PULSE=ON
-    -DWITH_CUPS=ON
-    -DWITH_PCSC=ON
-    -DWITH_ICU=ON
-    -DWITH_JPEG=ON
-    -DWITH_SERVER=ON
-    -DWITH_SWSCALE=ON
-    -DWITH_CHANNELS=ON
-    -DWITH_CLIENT_CHANNELS=ON
-    -DWITH_SERVER_CHANNELS=ON
-    -DCHANNEL_URBDRC_CLIENT=ON
-    -Wno-dev
-    -DWITH_LIBSYSTEMD=OFF
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    cmake "${_path[@]}" "${_flags[@]}" -B build -S $_name-$pkgver
-    cmake --build build --verbose
-}
-
-#--------
-# CHECK ]
-
-check() {
-  ctest --test-dir build --output-on-failure
-}
-
-#----------
-# PACKAGE ]
-
-package() {
-    depends+=(
-        alsa-lib libasound.so
-        ffmpeg libavcodec.so libavutil.so libswresample.so libswscale.so
-        icu libicuuc.so
-        libjpeg-turbo libjpeg.so
-        libpulse libpulse.so
-        libusb libusb-1.0.so
-        openssl libcrypto.so libssl.so
-        pam libpam.so
-    )
-
-    DESTDIR="$pkgdir" cmake --install build
-    install -vDm 644 $_name-$pkgver/{ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-arch=(x86_64)
-license=(Apache)
-
-sha512sums=(' ')

version/2.10.0-3/freerdp-2.0.0-manpage_formatting.patch

-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})

version/2.10.0-4/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obcommunity/freerdp
-#----------------
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-_name=FreeRDP
-pkgname=freerdp
-pkgver=2.10.0
-pkgrel=4
-epoch=2
-pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
-
-url='https://github.com/freerdp/freerdp'
-
-track=$pkgname/$pkgname/archive/${pkgver}
-target=${pkgname}-${pkgver}
-source=(
-    https://github.com/$track/$target.tar.gz
-    $pkgname-2.0.0-manpage_formatting.patch
-	https://github.com/FreeRDP/FreeRDP/commit/aa2cb9aa.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'alsa-lib'
-    'cmake'
-    'docbook-xsl'
-    'ffmpeg'
-    'icu'
-    'krb5'
-    'libjpeg-turbo'
-    'libpulse'
-    'libusb'
-    'openssl'
-    'pam'
-    'xmlto'
-    'xorgproto'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'glibc'
-    'libcups'
-    'libx11'
-    'libxcursor'
-    'libxext'
-    'libxdamage'
-    'libxfixes'
-    'libxkbcommon'
-    'libxi'
-    'libxinerama'
-    'libxkbfile'
-    'libxrandr'
-    'libxrender'
-    'libxtst'
-    'pcsclite'
-    'wayland'
-)
-
-provides=(
-    'libfreerdp2.so'
-    'libfreerdp-client2.so'
-    'libfreerdp-server2'
-    'libfreerdp-shadow2.so'
-    'libfreerdp-shadow-subsystem2.so'
-    'libwinpr2.so'
-    'libwinpr-tools2.so'
-    'libuwac0.so'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-
-    ## fix man page formatting:
-    ## https://bugs.archlinux.org/task/64814
-    patch -d $_name-$pkgver -p1 -i ../$pkgname-2.0.0-manpage_formatting.patch
-	patch -d $_name-$pkgver -p1 -i ../aa2cb9aa.patch # Fix build with FFmpeg 6
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-)
-
-_flags=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-    -DCMAKE_BUILD_TYPE=None
-    -DCMAKE_SKIP_INSTALL_RPATH=ON
-    -DPROXY_PLUGINDIR=/usr/lib/freerdp2/server/proxy/plugins
-    -DWITH_DSP_FFMPEG=ON
-    -DWITH_FFMPEG=ON
-    -DWITH_PULSE=ON
-    -DWITH_CUPS=ON
-    -DWITH_PCSC=ON
-    -DWITH_ICU=ON
-    -DWITH_JPEG=ON
-    -DWITH_SERVER=ON
-    -DWITH_SWSCALE=ON
-    -DWITH_CHANNELS=ON
-    -DWITH_CLIENT_CHANNELS=ON
-    -DWITH_SERVER_CHANNELS=ON
-    -DCHANNEL_URBDRC_CLIENT=ON
-    -Wno-dev
-    -DWITH_LIBSYSTEMD=OFF
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    cmake "${_path[@]}" "${_flags[@]}" -B build -S $_name-$pkgver
-    cmake --build build --verbose
-}
-
-#--------
-# CHECK ]
-
-check() {
-  ctest --test-dir build --output-on-failure
-}
-
-#----------
-# PACKAGE ]
-
-package() {
-    depends+=(
-        alsa-lib libasound.so
-        ffmpeg libavcodec.so libavutil.so libswresample.so libswscale.so
-        icu libicuuc.so
-        libjpeg-turbo libjpeg.so
-        libpulse libpulse.so
-        libusb libusb-1.0.so
-        openssl libcrypto.so libssl.so
-        pam libpam.so
-    )
-
-    DESTDIR="$pkgdir" cmake --install build
-    install -vDm 644 $_name-$pkgver/{ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-arch=(x86_64)
-license=(Apache)
-
-sha512sums=(' ')

version/2.10.0-4/freerdp-2.0.0-manpage_formatting.patch

-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})

version/2.10.0-5/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obcommunity/freerdp
-#----------------
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-_name=FreeRDP
-pkgname=freerdp
-pkgver=2.10.0
-pkgrel=5
-epoch=2
-pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
-
-url='https://github.com/freerdp/freerdp'
-
-track=$pkgname/$pkgname/archive/${pkgver}
-target=${pkgname}-${pkgver}
-source=(
-    https://github.com/$track/$target.tar.gz
-    $pkgname-2.0.0-manpage_formatting.patch
-	https://github.com/FreeRDP/FreeRDP/commit/aa2cb9aa.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'alsa-lib'
-    'cmake'
-    'docbook-xsl'
-    'ffmpeg'
-    'icu'
-    'krb5'
-    'libjpeg-turbo'
-    'libpulse'
-    'libusb'
-    'openssl'
-    'pam'
-    'xmlto'
-    'xorgproto'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'glibc'
-    'libcups'
-    'libx11'
-    'libxcursor'
-    'libxext'
-    'libxdamage'
-    'libxfixes'
-    'libxkbcommon'
-    'libxi'
-    'libxinerama'
-    'libxkbfile'
-    'libxrandr'
-    'libxrender'
-    'libxtst'
-    'pcsclite'
-    'wayland'
-)
-
-provides=(
-    'libfreerdp2.so'
-    'libfreerdp-client2.so'
-    'libfreerdp-server2'
-    'libfreerdp-shadow2.so'
-    'libfreerdp-shadow-subsystem2.so'
-    'libwinpr2.so'
-    'libwinpr-tools2.so'
-    'libuwac0.so'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-
-    ## fix man page formatting:
-    ## https://bugs.archlinux.org/task/64814
-    patch -d $_name-$pkgver -p1 -i ../$pkgname-2.0.0-manpage_formatting.patch
-	patch -d $_name-$pkgver -p1 -i ../aa2cb9aa.patch # Fix build with FFmpeg 6
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-)
-
-_flags=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_INSTALL_LIBDIR=lib
-    -DCMAKE_BUILD_TYPE=None
-    -DCMAKE_SKIP_INSTALL_RPATH=ON
-    -DPROXY_PLUGINDIR=/usr/lib/freerdp2/server/proxy/plugins
-    -DWITH_DSP_FFMPEG=ON
-    -DWITH_FFMPEG=ON
-    -DWITH_PULSE=ON
-    -DWITH_CUPS=ON
-    -DWITH_PCSC=ON
-    -DWITH_ICU=ON
-    -DWITH_JPEG=ON
-    -DWITH_SERVER=ON
-    -DWITH_SWSCALE=ON
-    -DWITH_CHANNELS=ON
-    -DWITH_CLIENT_CHANNELS=ON
-    -DWITH_SERVER_CHANNELS=ON
-    -DCHANNEL_URBDRC_CLIENT=ON
-    -Wno-dev
-    -DWITH_LIBSYSTEMD=OFF
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    cmake "${_path[@]}" "${_flags[@]}" -B build -S $_name-$pkgver
-    cmake --build build --verbose
-}
-
-#--------
-# CHECK ]
-
-check() {
-  ctest --test-dir build --output-on-failure
-}
-
-#----------
-# PACKAGE ]
-
-package() {
-    depends+=(
-        alsa-lib libasound.so
-        ffmpeg libavcodec.so libavutil.so libswresample.so libswscale.so
-        icu libicuuc.so
-        libjpeg-turbo libjpeg.so
-        libpulse libpulse.so
-        libusb libusb-1.0.so
-        openssl libcrypto.so libssl.so
-        pam libpam.so
-    )
-
-    DESTDIR="$pkgdir" cmake --install build
-    install -vDm 644 $_name-$pkgver/{ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-arch=(x86_64)
-license=(Apache)
-
-sha512sums=(' ')

version/2.10.0-5/freerdp-2.0.0-manpage_formatting.patch

-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})