diff options
-rw-r--r-- | .SRCINFO | 24 | ||||
-rw-r--r-- | PKGBUILD | 76 | ||||
-rw-r--r-- | patch-aws-client-http_utils.ads | 10 | ||||
-rw-r--r-- | patch-aws-dispatchers-callback.ads | 10 | ||||
-rw-r--r-- | patch-aws-net-acceptors.ads | 10 | ||||
-rw-r--r-- | patch-aws-net-websocket-registry.adb | 10 | ||||
-rw-r--r-- | patch-templates_parser.adb | 10 |
7 files changed, 113 insertions, 37 deletions
@@ -1,22 +1,30 @@ pkgbase = ada-web-server pkgdesc = A complete embeddable web application framework for Ada. - pkgver = 2021 - pkgrel = 2 + pkgver = 2022 + pkgrel = 1 url = http://libre.adacore.com/tools/aws arch = i686 arch = x86_64 groups = gcc-ada license = GPL - makedepends = git makedepends = gprbuild makedepends = texlive-bin makedepends = python-sphinx - depends = gcc-ada depends = openssl provides = aws - source = git+https://github.com/AdaCore/aws#commit=5ddd74408d86363411714957baad72be76012b35 - source = git+https://github.com/AdaCore/templates-parser#commit=2ed90c02deb53d5e453e62a4105354a9497c9ecd - sha1sums = SKIP - sha1sums = SKIP + source = aws.tar.gz::https://github.com/AdaCore/aws/archive/refs/tags/v22.0.0.tar.gz + source = templates-parser.tar.gz::https://github.com/AdaCore/templates-parser/archive/refs/tags/v22.0.0.tar.gz + source = patch-aws-client-http_utils.ads + source = patch-templates_parser.adb + source = patch-aws-dispatchers-callback.ads + source = patch-aws-net-acceptors.ads + source = patch-aws-net-websocket-registry.adb + sha256sums = 52abc9aee16975840da7754767f3f27b6bfcc88e4437f9befed9cfe76504d10c + sha256sums = 1e217260bf3b26809fc5d09f9a0ec22c2b0ed412600c0fea2291f02c30328941 + sha256sums = 1a32395e200e0518e64ec3584ad081a72ffda03d8bb97ed8060c29979fb60c0a + sha256sums = 419f17b9e037b582bedb67c76869a564b80f5a62f0269724d7d7da64be5b6c63 + sha256sums = 9413fff6b28b57531b606a224115f3f6de21ebc5c5c7cf9703e1d29ee81d279d + sha256sums = 71e302a87fc1581c54e4246d38d8956e7bdcf3107fb9855300e676e59e68ab38 + sha256sums = 8165dc74693ed40162d1426309cd4a304f1fd213ec35915ed21662ccaec39587 pkgname = ada-web-server @@ -1,8 +1,8 @@ # Maintainer: Rod Kay <rodakay5 at gmail dot com> pkgname=ada-web-server -pkgver=2021 -pkgrel=2 +pkgver=2022 +pkgrel=1 pkgdesc="A complete embeddable web application framework for Ada." arch=(i686 x86_64) @@ -10,66 +10,85 @@ url=http://libre.adacore.com/tools/aws license=(GPL) groups=(gcc-ada) -depends=(gcc-ada openssl) -makedepends=(git gprbuild texlive-bin python-sphinx) +depends=(openssl) +makedepends=(gprbuild texlive-bin python-sphinx) provides=(aws) -source=('git+https://github.com/AdaCore/aws#commit=5ddd74408d86363411714957baad72be76012b35' - 'git+https://github.com/AdaCore/templates-parser#commit=2ed90c02deb53d5e453e62a4105354a9497c9ecd') -sha1sums=('SKIP' - 'SKIP') +source=(aws.tar.gz::https://github.com/AdaCore/aws/archive/refs/tags/v22.0.0.tar.gz + templates-parser.tar.gz::https://github.com/AdaCore/templates-parser/archive/refs/tags/v22.0.0.tar.gz + patch-aws-client-http_utils.ads + patch-templates_parser.adb + patch-aws-dispatchers-callback.ads + patch-aws-net-acceptors.ads + patch-aws-net-websocket-registry.adb) + +sha256sums=(52abc9aee16975840da7754767f3f27b6bfcc88e4437f9befed9cfe76504d10c + 1e217260bf3b26809fc5d09f9a0ec22c2b0ed412600c0fea2291f02c30328941 + 1a32395e200e0518e64ec3584ad081a72ffda03d8bb97ed8060c29979fb60c0a + 419f17b9e037b582bedb67c76869a564b80f5a62f0269724d7d7da64be5b6c63 + 9413fff6b28b57531b606a224115f3f6de21ebc5c5c7cf9703e1d29ee81d279d + 71e302a87fc1581c54e4246d38d8956e7bdcf3107fb9855300e676e59e68ab38 + 8165dc74693ed40162d1426309cd4a304f1fd213ec35915ed21662ccaec39587) prepare() { - cd $srcdir/aws + cd $srcdir/aws-22.0.0 rmdir templates_parser - ln -s "$srcdir/templates-parser" templates_parser + ln -s "$srcdir/templates-parser-22.0.0" templates_parser + + patch -p0 -i ../patch-aws-client-http_utils.ads + patch -p0 -i ../patch-aws-dispatchers-callback.ads + patch -p0 -i ../patch-aws-net-acceptors.ads + patch -p0 -i ../patch-aws-net-websocket-registry.adb + + cd $srcdir/templates-parser-22.0.0 + patch -p0 -i ../patch-templates_parser.adb } build() { - cd $srcdir/aws/templates_parser + cd "$srcdir/aws-22.0.0/templates_parser" - make DEBUG=false prefix=/usr setup - make -j1 DEBUG=false build + PRJ_BUILD=Release make DEBUG=false prefix=/usr setup + PRJ_BUILD=Release make DEBUG=false build cd docs mkdir -p build make -j1 html latexpdf - cd $srcdir/aws + cd $srcdir/aws-22.0.0 - make prefix=/usr SOCKET=openssl setup - make -j1 build + PRJ_BUILD=Release DEBUG=false make -j1 prefix=/usr SOCKET=openssl setup + PRJ_BUILD=Release DEBUG=false make -j1 build - cd $srcdir/aws/docs + cd $srcdir/aws-22.0.0/docs make -j1 html latexpdf } package() { - cd $srcdir/aws/templates_parser + cd $srcdir/aws-22.0.0/templates_parser make -j1 DEBUG=false DESTDIR="$pkgdir" install - cd $srcdir/aws + cd $srcdir/aws-22.0.0 make -j1 DESTDIR="$pkgdir" install - # Install the license. - install -D -m644 \ - "COPYING3" \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING3" + # Install the license. + install -D -m644 \ + "COPYING3" \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING3" - # Install the custom license. - install -D -m644 \ - "COPYING.RUNTIME" \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING.RUNTIME" + # Install the custom license. + install -D -m644 \ + "COPYING.RUNTIME" \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING.RUNTIME" # Install the templates-parser license. @@ -81,5 +100,4 @@ package() install -D -m644 \ "COPYING.RUNTIME" \ "$pkgdir/usr/share/licenses/templates-parser/COPYING.RUNTIME" - -} +}
\ No newline at end of file diff --git a/patch-aws-client-http_utils.ads b/patch-aws-client-http_utils.ads new file mode 100644 index 000000000000..7eca5ee99a2d --- /dev/null +++ b/patch-aws-client-http_utils.ads @@ -0,0 +1,10 @@ +--- ./src/core/aws-client-http_utils.ads 2021-10-07 03:24:29.000000000 +1100 ++++ ./src/core/aws-client-http_utils.ads-new 2022-05-17 16:11:07.161195573 +1000 +@@ -29,7 +29,6 @@ + + pragma Ada_2012; + +-with AWS.Client; + with AWS.Response; + with AWS.Status; + diff --git a/patch-aws-dispatchers-callback.ads b/patch-aws-dispatchers-callback.ads new file mode 100644 index 000000000000..a1a02167d9d6 --- /dev/null +++ b/patch-aws-dispatchers-callback.ads @@ -0,0 +1,10 @@ +--- ./src/core/aws-dispatchers-callback.ads 2021-10-07 03:24:29.000000000 +1100 ++++ ./src/core/aws-dispatchers-callback.ads-new 2022-05-17 16:23:24.691206335 +1000 +@@ -31,7 +31,6 @@ + + -- Dispatch on a Callback procedure + +-with AWS.Dispatchers; + with AWS.Response; + with AWS.Status; + diff --git a/patch-aws-net-acceptors.ads b/patch-aws-net-acceptors.ads new file mode 100644 index 000000000000..65eb2894ea8b --- /dev/null +++ b/patch-aws-net-acceptors.ads @@ -0,0 +1,10 @@ +--- ./src/core/aws-net-acceptors.ads 2021-10-07 03:24:29.000000000 +1100 ++++ ./src/core/aws-net-acceptors.ads-new 2022-05-17 16:34:31.371215958 +1000 +@@ -33,7 +33,6 @@ + + with Ada.Containers.Doubly_Linked_Lists; + +-with AWS.Net; + with AWS.Net.Generic_Sets; + with AWS.Utils; + diff --git a/patch-aws-net-websocket-registry.adb b/patch-aws-net-websocket-registry.adb new file mode 100644 index 000000000000..044d1ef987c4 --- /dev/null +++ b/patch-aws-net-websocket-registry.adb @@ -0,0 +1,10 @@ +--- ./src/core/aws-net-websocket-registry.adb 2021-10-07 03:24:29.000000000 +1100 ++++ ./src/core/aws-net-websocket-registry.adb-new 2022-05-17 16:39:54.204553977 +1000 +@@ -46,7 +46,6 @@ + with AWS.Net.Memory; + with AWS.Net.Poll_Events; + with AWS.Net.Std; +-with AWS.Net.WebSocket; + with AWS.Utils; + + package body AWS.Net.WebSocket.Registry is diff --git a/patch-templates_parser.adb b/patch-templates_parser.adb new file mode 100644 index 000000000000..e28d8dd86862 --- /dev/null +++ b/patch-templates_parser.adb @@ -0,0 +1,10 @@ +--- ./src/templates_parser.adb 2020-10-31 04:35:33.000000000 +1100 ++++ ./src/templates_parser.adb-new 2022-05-17 16:14:23.327865165 +1000 +@@ -2079,7 +2079,6 @@ + Strings.Both); + First, Last : Natural; + Next_Last : Natural; +- pragma Unreferenced (Next_Last); + begin + if Is_Number (Ind_Str) then + Ind := Natural'Value (Ind_Str); |