From 6d24424c1261faf2bec2e8ebefa71e87f977f260 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 1 Jul 2024 07:39:36 +0200 Subject: [PATCH] xmlto: Update to 0.0.29 patch is included in the new release --- ...tput-path-to-unix-path-on-cygwin-msy.patch | 43 ------------------- xmlto/PKGBUILD | 15 +++---- 2 files changed, 7 insertions(+), 51 deletions(-) delete mode 100644 xmlto/0001-xmlto-convert-output-path-to-unix-path-on-cygwin-msy.patch diff --git a/xmlto/0001-xmlto-convert-output-path-to-unix-path-on-cygwin-msy.patch b/xmlto/0001-xmlto-convert-output-path-to-unix-path-on-cygwin-msy.patch deleted file mode 100644 index fc3fa6d5..00000000 --- a/xmlto/0001-xmlto-convert-output-path-to-unix-path-on-cygwin-msy.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0cd33d166e95c7b76a7de6c2bdd052681004bb8a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Tue, 8 Feb 2022 22:55:57 +0400 -Subject: [PATCH] xmlto: convert output path to unix path on cygwin/msys -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When xmlto is invoked with "-o C:/src/build", the -resulting files end up under a subdirecty "C:/src/build/" of the current -working directory. - -Convert the argument to a unix path on cygwin/msys. - -Signed-off-by: Marc-André Lureau ---- - xmlto.in | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/xmlto.in b/xmlto.in -index fbf2254919d6..e721d4356658 100755 ---- a/xmlto.in -+++ b/xmlto.in -@@ -314,9 +314,13 @@ while [ "$#" -gt "0" ]; do - shift 2 - ;; - -o) -- case "$2" in -- /*) OUTPUT_DIR="$2" ;; -- *) OUTPUT_DIR="$WD/$2" ;; -+ OUTPUT_DIR="$2" -+ if type -p cygpath >/dev/null; then -+ OUTPUT_DIR=$(cygpath "$OUTPUT_DIR") -+ fi -+ case "$OUTPUT_DIR" in -+ /*) OUTPUT_DIR="$OUTPUT_DIR" ;; -+ *) OUTPUT_DIR="$WD/$OUTPUT_DIR" ;; - esac - shift 2 - ;; --- -2.34.1.428.gdcc0cd074f0c - diff --git a/xmlto/PKGBUILD b/xmlto/PKGBUILD index d4bd2425..f9288610 100644 --- a/xmlto/PKGBUILD +++ b/xmlto/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Alexey Pavlov pkgname=xmlto -pkgver=0.0.28 -pkgrel=4 +pkgver=0.0.29 +pkgrel=1 pkgdesc="Convert xml to many other formats" arch=('i686' 'x86_64') url="https://pagure.io/xmlto/" @@ -12,14 +12,13 @@ msys2_references=( license=('GPL') depends=('libxslt' 'perl-YAML-Syck' 'perl-Test-Pod') makedepends=('docbook-xsl' 'autotools' 'gcc') -source=("https://releases.pagure.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 0001-xmlto-convert-output-path-to-unix-path-on-cygwin-msy.patch) -sha256sums=('1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276' - '981e200d9470852048df58fa7afbd02264b75d81b8e572c1aba3dc1487ad0f9d') +source=("https://pagure.io/xmlto/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha256sums=('40504db68718385a4eaa9154a28f59e51e59d006d1aa14f5bc9d6fded1d6017a') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/0001-xmlto-convert-output-path-to-unix-path-on-cygwin-msy.patch + cd "${pkgname}-${pkgver}" + + autoreconf -vfi } build() {