From e63f88b1a7589c41c6fa8a8d0a8873cf3dcf5aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Fri, 2 Dec 2022 09:53:37 +0100 Subject: [PATCH] asciidoc: update to 10.2.0 --- asciidoc/0001-W32-confdir.msys2.patch | 15 ------------ asciidoc/PKGBUILD | 33 ++++++++------------------- 2 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 asciidoc/0001-W32-confdir.msys2.patch diff --git a/asciidoc/0001-W32-confdir.msys2.patch b/asciidoc/0001-W32-confdir.msys2.patch deleted file mode 100644 index 310b3eb9..00000000 --- a/asciidoc/0001-W32-confdir.msys2.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- asciidoc-8.6.7/asciidoc.py.orig 2012-03-14 03:07:34 +0400 -+++ asciidoc-8.6.7/asciidoc.py 2012-03-27 18:16:41 +0400 -@@ -4556,6 +4556,12 @@ - APP_FILE = os.path.realpath(cmd) - global APP_DIR - APP_DIR = os.path.dirname(APP_FILE) -+ global CONF_DIR -+ if not os.path.isdir (CONF_DIR) and os.name == 'nt': -+ app_dir_real = os.path.realpath (APP_DIR) -+ app_prefix, app_last_dir = os.path.split (app_dir_real) -+ if len (app_prefix) > 0 and app_last_dir == 'bin': -+ CONF_DIR = os.path.join (app_prefix, 'etc', 'asciidoc') - global USER_DIR - USER_DIR = userdir() - if USER_DIR is not None: diff --git a/asciidoc/PKGBUILD b/asciidoc/PKGBUILD index 2758170e..1769cadd 100644 --- a/asciidoc/PKGBUILD +++ b/asciidoc/PKGBUILD @@ -1,13 +1,14 @@ # Maintainer: Alexey Pavlov pkgname=asciidoc -pkgver=9.1.1 -pkgrel=2 +pkgver=10.2.0 +pkgrel=1 pkgdesc='Text document format for short documents, articles, books and UNIX man pages.' arch=('any') url='https://asciidoc.org/' license=('GPL') -depends=('python' 'libxslt' 'docbook-xsl' 'autotools') +depends=('python' 'libxslt' 'docbook-xsl') +makedepends=('python-setuptools' 'gcc') # optdepends=('lilypond: music-filter' # 'imagemagick: music-filter (used in conjunction with lilypond)' # 'source-highlight: source-highlight-filter' @@ -15,35 +16,19 @@ depends=('python' 'libxslt' 'docbook-xsl' 'autotools') # 'fop: alternative pdf generation' # 'lynx: text generation' # 'w3m: text generation (alternative to lynx)') -source=("https://github.com/asciidoc/asciidoc-py3/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 0001-W32-confdir.msys2.patch) -sha256sums=('ea39760ac2739496c14002902571592dc2ae2fa673296ec141a9e491d9c11fca' - '71f44b513f627b133afead38576fcb8a5460d0514174a4ce219c6ea761d8b40c') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/0001-W32-confdir.msys2.patch -} +source=("https://github.com/asciidoc-py/asciidoc-py/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha256sums=('237b2ba5c35c0ae7ccd4cd44ebf1d87c20b2695dae01798954416d492ef7fa0e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - autoreconf -fi - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc - - make + /usr/bin/python setup.py build } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make install DESTDIR=${pkgdir} + /usr/bin/python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build - local _pyver=$(/usr/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") - - install -Dm644 asciidocapi.py \ - ${pkgdir}/usr/lib/python${_pyver}/site-packages/asciidocapi.py + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/asciidoc/LICENSE" }