Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] lua54-luaexpat: update to 1.5.0
@ 2022-10-04  6:56 cultab
  2022-10-04  6:58 ` [PR PATCH] [Updated] " cultab
  2022-10-04 19:26 ` [PR PATCH] [Merged]: " leahneukirchen
  0 siblings, 2 replies; 3+ messages in thread
From: cultab @ 2022-10-04  6:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1717 bytes --]

There is a new pull request by cultab against master on the void-packages repository

https://github.com/cultab/void-packages luaexpat
https://github.com/void-linux/void-packages/pull/39694

lua54-luaexpat: update to 1.5.0
#### Testing the changes
- I tested the changes in this PR: **briefly** ran the following example code sourced from the project's homepage and tested by writing a few xml tags to it's stdin.

```lua
lxp = require"lxp" -- added "lxp =" which was NOT IN the version on the homepage

local count = 0
callbacks = {
    StartElement = function (parser, name)
        io.write("+ ", string.rep(" ", count), name, "\n")
        count = count + 1
    end,
    EndElement = function (parser, name)
        count = count - 1
        io.write("- ", string.rep(" ", count), name, "\n")
    end
}

p = lxp.new(callbacks)

for l in io.lines() do  -- iterate lines
    p:parse(l)          -- parses the line
    p:parse("\n")       -- parses the end of line
end
p:parse()               -- finishes the document
p:close()               -- closes the parser
```

Then I ran:

```shell
 echo '<asdf>one level<noice>two</noice></asdf>' | lua<version> test.lua
```

and got the following every time:

```
+ asdf
+  noice
-  noice
- asdf
```


#### Local build testing
- I built this PR locally for my native architecture, x86_64, glibc
- I build (and tested briefly) packages for lua versions 5.4, 5.3 5.2 and 5.1

Updated this package because it was mentioned on #39072 and go-ipfs turned out to be very hard to upgrade (not really but fs-repo-migration was hard 😡).



A patch file from https://github.com/void-linux/void-packages/pull/39694.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-luaexpat-39694.patch --]
[-- Type: text/x-diff, Size: 2735 bytes --]

From adacfd03873f931076287f62639ebff8c6971472 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Tue, 4 Oct 2022 09:22:38 +0300
Subject: [PATCH 1/2] lua54-luaexpat: update checksum and distfiles

As per the documentation on the [homepage](https://matthewwild.co.uk/projects/luaexpat/)
under Download, the source is distributed throught github.

It seems the move was done on version 1.4.0,
versions 1.3.0 and 1.2.0 have been recreated on the github repo.
---
 srcpkgs/lua54-luaexpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua54-luaexpat/template b/srcpkgs/lua54-luaexpat/template
index 7e2e1004727c..8221f293200b 100644
--- a/srcpkgs/lua54-luaexpat/template
+++ b/srcpkgs/lua54-luaexpat/template
@@ -11,8 +11,8 @@ short_desc="${_desc} (5.4.x)"
 maintainer="Duncaen <mail@duncano.de>"
 license="MIT"
 homepage="https://matthewwild.co.uk/projects/luaexpat/"
-distfiles="https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz"
-checksum=d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3
+distfiles="https://github.com/lunarmodules/luaexpat/archive/refs/tags/${version}.tar.gz"
+checksum=9906b1ec81ba141f4cd03e2c8f6c633b15e40b3d341c52a1ef97243e521cdce1
 
 post_extract() {
 	cd "${wrksrc}"

From 6b6d6b4358a6fe2f56476bb6dc1ffdf7e2b36ee0 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Tue, 4 Oct 2022 09:35:57 +0300
Subject: [PATCH 2/2] lua54-luaexpat: update to 1.5.0

---
 srcpkgs/lua54-luaexpat/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/lua54-luaexpat/template b/srcpkgs/lua54-luaexpat/template
index 8221f293200b..980078f358d3 100644
--- a/srcpkgs/lua54-luaexpat/template
+++ b/srcpkgs/lua54-luaexpat/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luaexpat'
 pkgname=lua54-luaexpat
-version=1.3.0
-revision=3
+version=1.5.0
+revision=1
 wrksrc=luaexpat-${version}
 make_build_args="EXPAT_INC=-I${XBPS_CROSS_BASE}/usr/include"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel expat-devel"
@@ -12,16 +12,12 @@ maintainer="Duncaen <mail@duncano.de>"
 license="MIT"
 homepage="https://matthewwild.co.uk/projects/luaexpat/"
 distfiles="https://github.com/lunarmodules/luaexpat/archive/refs/tags/${version}.tar.gz"
-checksum=9906b1ec81ba141f4cd03e2c8f6c633b15e40b3d341c52a1ef97243e521cdce1
+checksum=ae5710a948831b4260c2910f67d651e247dc3d48a228a31e1e78dd9e4a37aa48
 
 post_extract() {
 	cd "${wrksrc}"
 	mkdir -p lua5.1
 
-	sed -n '/Copyright/,/SOFTWARE\./p' doc/us/license.html > LICENSE
-	# lua 5.3+ does not work with -ansi (integer type detection error)
-	vsed -i 's, -ansi,,' Makefile
-
 	mv * lua5.1 || true
 	cp -a lua5.1 lua5.2
 	cp -a lua5.1 lua5.3

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] lua54-luaexpat: update to 1.5.0
  2022-10-04  6:56 [PR PATCH] lua54-luaexpat: update to 1.5.0 cultab
@ 2022-10-04  6:58 ` cultab
  2022-10-04 19:26 ` [PR PATCH] [Merged]: " leahneukirchen
  1 sibling, 0 replies; 3+ messages in thread
From: cultab @ 2022-10-04  6:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1722 bytes --]

There is an updated pull request by cultab against master on the void-packages repository

https://github.com/cultab/void-packages luaexpat
https://github.com/void-linux/void-packages/pull/39694

lua54-luaexpat: update to 1.5.0
#### Testing the changes
- I tested the changes in this PR: **briefly** ran the following example code sourced from the project's homepage and tested by writing a few xml tags to it's stdin.

```lua
lxp = require"lxp" -- added "lxp =" which was NOT IN the version on the homepage

local count = 0
callbacks = {
    StartElement = function (parser, name)
        io.write("+ ", string.rep(" ", count), name, "\n")
        count = count + 1
    end,
    EndElement = function (parser, name)
        count = count - 1
        io.write("- ", string.rep(" ", count), name, "\n")
    end
}

p = lxp.new(callbacks)

for l in io.lines() do  -- iterate lines
    p:parse(l)          -- parses the line
    p:parse("\n")       -- parses the end of line
end
p:parse()               -- finishes the document
p:close()               -- closes the parser
```

Then I ran:

```shell
 echo '<asdf>one level<noice>two</noice></asdf>' | lua<version> test.lua
```

and got the following every time:

```
+ asdf
+  noice
-  noice
- asdf
```


#### Local build testing
- I built this PR locally for my native architecture, x86_64, glibc
- I build (and tested briefly) packages for lua versions 5.4, 5.3 5.2 and 5.1

Updated this package because it was mentioned on #39072 and go-ipfs turned out to be very hard to upgrade (not really but fs-repo-migration was hard 😡).



A patch file from https://github.com/void-linux/void-packages/pull/39694.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-luaexpat-39694.patch --]
[-- Type: text/x-diff, Size: 2735 bytes --]

From 0c740ac693efac37a6228e17999f91f7361c52c6 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Tue, 4 Oct 2022 09:22:38 +0300
Subject: [PATCH 1/2] lua54-luaexpat: update checksum and distfiles

As per the documentation on the
[homepage](https://matthewwild.co.uk/projects/luaexpat/)
under Download, the source is distributed throught github.

It seems the move was done on version 1.4.0,
versions 1.3.0 and 1.2.0 have been recreated on the github repo.
---
 srcpkgs/lua54-luaexpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua54-luaexpat/template b/srcpkgs/lua54-luaexpat/template
index 7e2e1004727c..8221f293200b 100644
--- a/srcpkgs/lua54-luaexpat/template
+++ b/srcpkgs/lua54-luaexpat/template
@@ -11,8 +11,8 @@ short_desc="${_desc} (5.4.x)"
 maintainer="Duncaen <mail@duncano.de>"
 license="MIT"
 homepage="https://matthewwild.co.uk/projects/luaexpat/"
-distfiles="https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz"
-checksum=d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3
+distfiles="https://github.com/lunarmodules/luaexpat/archive/refs/tags/${version}.tar.gz"
+checksum=9906b1ec81ba141f4cd03e2c8f6c633b15e40b3d341c52a1ef97243e521cdce1
 
 post_extract() {
 	cd "${wrksrc}"

From a12b11436e830bf206fd54a57d2a8a060ed02689 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Tue, 4 Oct 2022 09:35:57 +0300
Subject: [PATCH 2/2] lua54-luaexpat: update to 1.5.0

---
 srcpkgs/lua54-luaexpat/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/lua54-luaexpat/template b/srcpkgs/lua54-luaexpat/template
index 8221f293200b..980078f358d3 100644
--- a/srcpkgs/lua54-luaexpat/template
+++ b/srcpkgs/lua54-luaexpat/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luaexpat'
 pkgname=lua54-luaexpat
-version=1.3.0
-revision=3
+version=1.5.0
+revision=1
 wrksrc=luaexpat-${version}
 make_build_args="EXPAT_INC=-I${XBPS_CROSS_BASE}/usr/include"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel expat-devel"
@@ -12,16 +12,12 @@ maintainer="Duncaen <mail@duncano.de>"
 license="MIT"
 homepage="https://matthewwild.co.uk/projects/luaexpat/"
 distfiles="https://github.com/lunarmodules/luaexpat/archive/refs/tags/${version}.tar.gz"
-checksum=9906b1ec81ba141f4cd03e2c8f6c633b15e40b3d341c52a1ef97243e521cdce1
+checksum=ae5710a948831b4260c2910f67d651e247dc3d48a228a31e1e78dd9e4a37aa48
 
 post_extract() {
 	cd "${wrksrc}"
 	mkdir -p lua5.1
 
-	sed -n '/Copyright/,/SOFTWARE\./p' doc/us/license.html > LICENSE
-	# lua 5.3+ does not work with -ansi (integer type detection error)
-	vsed -i 's, -ansi,,' Makefile
-
 	mv * lua5.1 || true
 	cp -a lua5.1 lua5.2
 	cp -a lua5.1 lua5.3

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: lua54-luaexpat: update to 1.5.0
  2022-10-04  6:56 [PR PATCH] lua54-luaexpat: update to 1.5.0 cultab
  2022-10-04  6:58 ` [PR PATCH] [Updated] " cultab
@ 2022-10-04 19:26 ` leahneukirchen
  1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2022-10-04 19:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]

There's a merged pull request on the void-packages repository

lua54-luaexpat: update to 1.5.0
https://github.com/void-linux/void-packages/pull/39694

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly** ran the following example code sourced from the project's homepage and tested by writing a few xml tags to it's stdin.

```lua
lxp = require"lxp" -- added "lxp =" which was NOT IN the version on the homepage

local count = 0
callbacks = {
    StartElement = function (parser, name)
        io.write("+ ", string.rep(" ", count), name, "\n")
        count = count + 1
    end,
    EndElement = function (parser, name)
        count = count - 1
        io.write("- ", string.rep(" ", count), name, "\n")
    end
}

p = lxp.new(callbacks)

for l in io.lines() do  -- iterate lines
    p:parse(l)          -- parses the line
    p:parse("\n")       -- parses the end of line
end
p:parse()               -- finishes the document
p:close()               -- closes the parser
```

Then I ran:

```shell
 echo '<asdf>one level<noice>two</noice></asdf>' | lua<version> test.lua
```

and got the following every time:

```
+ asdf
+  noice
-  noice
- asdf
```


#### Local build testing
- I built this PR locally for my native architecture, x86_64, glibc
- I build (and tested briefly) packages for lua versions 5.4, 5.3 5.2 and 5.1

Updated this package because it was mentioned on #39072 and go-ipfs turned out to be very hard to upgrade (not really but fs-repo-migration was hard 😡).



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-10-04 19:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-04  6:56 [PR PATCH] lua54-luaexpat: update to 1.5.0 cultab
2022-10-04  6:58 ` [PR PATCH] [Updated] " cultab
2022-10-04 19:26 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).