summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD85
-rw-r--r--expose-cargs-and-largs-makefile.patch20
3 files changed, 69 insertions, 54 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f6dbc893f332..6f9e02326552 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
pkgbase = xmlada
- pkgdesc = An XML parser for Ada95
- pkgver = 22.0.0
- pkgrel = 1
+ pkgdesc = An XML parser for Ada95.
+ pkgver = 24.0w
+ pkgrel = 2
epoch = 1
- url = https://github.com/AdaCore/xmlada/
+ url = https://github.com/AdaCore/xmlada
arch = i686
arch = x86_64
license = GPL3
license = custom
- makedepends = gprbuild-bootstrap
- depends = gcc-ada
+ makedepends = gprbuild
+ makedepends = gcc-ada
conflicts = xmlada-git
- source = xmlada-22.0.0.tar.gz::https://github.com/AdaCore/xmlada//archive/v22.0.0.tar.gz
+ source = https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/xmlada-24.0w-20230324-1684A-src.tar.gz
source = expose-cargs-and-largs-makefile.patch
- sha256sums = 853ed895defd395c0bc96c23a50812168b656b31befc1336f45c5541f2bec06d
- sha256sums = 8cf1c7a650a698ec9b7b1c71659be82f7f31a37dbdd8d24636c17ebfb0e7b989
+ sha256sums = c243de68f3f7c0f5e8a23d24ab0725d038f4dd2b7798855a3b91b574e44e2dc1
+ sha256sums = 7543e5fa8f2b0b400b937b0b3bb27b46b263a3cd7b17f00f6f9c6b3905729610
pkgname = xmlada
diff --git a/PKGBUILD b/PKGBUILD
index fd5c6af1fe21..d62bc9fc14ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,76 @@
-# Maintainer: xiretza <xiretza+aur@gmail.com>
# Maintainer: Rod Kay <rodakay5 at gmail dot com>
+
# Contributor: Pierre-Marie de Rodat <pmderodat on #ada at freenode.net>
# Contributor: Earnestly <zibeon AT googlemail.com>
pkgname=xmlada
+pkgdesc='An XML parser for Ada95.'
+pkgver=24.0w
+pkgrel=2
epoch=1
-pkgver=22.0.0
-pkgrel=1
-pkgdesc="An XML parser for Ada95"
-arch=('i686' 'x86_64')
-url="https://github.com/AdaCore/xmlada/"
-license=('GPL3' 'custom')
-depends=('gcc-ada')
-makedepends=('gprbuild-bootstrap')
-conflicts=("$pkgname-git")
-
-source=(
- "$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
- 'expose-cargs-and-largs-makefile.patch'
-)
-sha256sums=('853ed895defd395c0bc96c23a50812168b656b31befc1336f45c5541f2bec06d'
- '8cf1c7a650a698ec9b7b1c71659be82f7f31a37dbdd8d24636c17ebfb0e7b989')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- patch -Np1 -i "$srcdir/expose-cargs-and-largs-makefile.patch"
+
+arch=(i686 x86_64)
+url=https://github.com/AdaCore/xmlada
+license=(GPL3 custom)
+
+#makedepends=(gprbuild-bootstrap gcc-ada)
+makedepends=(gprbuild gcc-ada)
+conflicts=($pkgname-git)
+
+source=(https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/$pkgname-$pkgver-20230324-1684A-src.tar.gz
+ expose-cargs-and-largs-makefile.patch)
+
+sha256sums=(c243de68f3f7c0f5e8a23d24ab0725d038f4dd2b7798855a3b91b574e44e2dc1
+ 7543e5fa8f2b0b400b937b0b3bb27b46b263a3cd7b17f00f6f9c6b3905729610)
+
+_xmlada_src=$pkgname-$pkgver-20230428-16463-src
+
+
+prepare()
+{
+ cd $srcdir/$_xmlada_src
+
+ patch -Np0 -i $srcdir/expose-cargs-and-largs-makefile.patch
}
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --libexecdir=/lib --enable-shared
+
+build()
+{
+ cd $srcdir/$_xmlada_src
+
+ ./configure --prefix=/usr \
+ --libexecdir=/lib \
+ --enable-shared \
+ --enable-build=Production
# Rid flags not used by Ada.
+ #
CFLAGS="${CFLAGS//-Wformat}"
CFLAGS="${CFLAGS//-Werror=format-security}"
# Make using a single job (-j1) to avoid the same file being compiled at the same time.
+ #
make -j1 GPRBUILD_OPTIONS=-R
}
-package() {
- cd "$srcdir/$pkgname-$pkgver"
+
+package()
+{
+ cd $srcdir/$_xmlada_src
# Make one install at a time to avoid GPRinstall reading/writing to
# the same installed project files at the same time.
- make -j1 prefix="$pkgdir/usr" install
+ #
+ make -j1 prefix=$pkgdir/usr install
- # Install the license.
+ # Install the licenses.
+ #
install -D -m644 \
- "COPYING3" \
- "$pkgdir/usr/share/licenses/$pkgname/COPYING3"
+ COPYING3 \
+ $pkgdir/usr/share/licenses/$pkgname/COPYING3
# Install the custom license.
install -D -m644 \
- "COPYING.RUNTIME" \
- "$pkgdir/usr/share/licenses/$pkgname/COPYING.RUNTIME"
-}
+ COPYING.RUNTIME \
+ $pkgdir/usr/share/licenses/$pkgname/COPYING.RUNTIME
+} \ No newline at end of file
diff --git a/expose-cargs-and-largs-makefile.patch b/expose-cargs-and-largs-makefile.patch
index ee2662a64387..8cbe752d6cab 100644
--- a/expose-cargs-and-largs-makefile.patch
+++ b/expose-cargs-and-largs-makefile.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.in b/Makefile.in
-index c6327d2..3355762 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -51,14 +51,22 @@ all: static
+--- Makefile.in-orig 2022-09-28 16:33:19.000000000 +1000
++++ Makefile.in 2022-11-15 21:15:27.002332097 +1100
+@@ -68,14 +68,22 @@
install: install-clean install-static
endif
@@ -15,16 +13,16 @@ index c6327d2..3355762 100644
+endif
+
static:
-- ${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr
-+ ${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr $(CARGS) $(LARGS)
+- ${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA}
++ ${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA} $(CARGS) $(LARGS)
shared relocatable:
-- ${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr
-+ ${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr $(CARGS) $(LARGS)
+- ${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA}
++ ${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA} $(CARGS) $(LARGS)
static-pic:
-- ${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr
-+ ${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr $(CARGS) $(LARGS)
+- ${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA}
++ ${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA} $(CARGS) $(LARGS)
# Rebuild the tests (and not the XML/Ada code itself)
test: force