From: alerque <alerque@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Bump to v0.10.9 release, fix URLs, add dependencies
Date: Fri, 24 Jul 2020 15:52:24 +0200 [thread overview]
Message-ID: <20200724135224.VIAThFrucE2IEB5VodPfJ1bKp-VJ5V0V4d8skCTZsEw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18306@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]
There is an updated pull request by alerque against master on the void-packages repository
https://github.com/alerque/void-packages patch-1
https://github.com/void-linux/void-packages/pull/18306
Bump to v0.10.9 release, fix URLs, add dependencies
- [x] Bump release
- [x] Update project URLs (moved to GitHub org since last release)
- [x] Update checksum
- [x] Add `--with-system-luarocks`. Note this is a new option since the last release, _not_ the default, but probably an option in keeping with Void Linux _MO_.
- [ ] Needs new packages for new dependencies not currently available:
- [ ] lua-epnf
- [ ] lua-cassowary
- [ ] lua-cosmo
- [ ] lua-linenoise
- [ ] lua-repl
- [ ] lua-penlight
- [ ] lua-vstruct
- [ ] lua-stdlib
- [ ] Add documentation PDF as users manual
- [ ] Make sure (new) man page gets packaged
Some of these Lua packages that are missing were required by the previous version too (e.g. stdlib) so I'm not sure what's going on here.
If there is anything we can do upstream in SILE to make packaging easier let me know, I'm happy to facilitate a point release if
A patch file from https://github.com/void-linux/void-packages/pull/18306.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-18306.patch --]
[-- Type: text/x-diff, Size: 8796 bytes --]
From d6a72b4c3105fdb271f0baca576a534068213c76 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Tue, 14 Jan 2020 14:23:33 +0300
Subject: [PATCH 1/4] sile: Update to v0.10.3
Fixes upstream URLs, add new dependencies (not all packaged yet, needs
other upstream work.)
---
srcpkgs/sile/template | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 3d47b117466..0e9b0164f4e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,23 +1,27 @@
# Template file for 'sile'
pkgname=sile
-version=0.9.5.1
-revision=4
+version=0.10.3
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
- lua51-zlib lua51-luafilesystem lua51-luasocket lua51-luasec"
-depends="lua51-lpeg lua51-luaexpat lua51-zlib lua51-luafilesystem
- lua51-luasocket lua51-luasec"
+makedepends="fontconfig-devel harfbuzz-devel icu-devel lua51
+ lua51-cassowary lua51-cliargs lua51-cosmo lua51-epnf lua51-linenoise lua51-penlight
+ lua51-repl lua51-stdlib lua51-vstruct lua51-zlib lua51-bitlib lua51-lpeg
+ lua51-luasec lua51-zlib lua51-luaexpat lua51-luafilesystem lua51-luasocket"
+depends="fonts-sil-gentium lua51
+ lua51-cassowary lua51-cliargs lua51-cosmo lua51-epnf lua51-linenoise lua51-penlight
+ lua51-repl lua51-stdlib lua51-vstruct lua51-zlib lua51-bitlib lua51-lpeg
+ lua51-luasec lua51-zlib lua51-luaexpat lua51-luafilesystem lua51-luasocket"
short_desc="Modern typesetting system inspired by TeX"
maintainer="John <me@johnnynator.dev>"
license="MIT"
-homepage="http://www.sile-typesetter.org/"
-distfiles="https://github.com/simoncozens/sile/releases/download/v${version}/sile-${version}.tar.bz2"
-checksum=60cdcc4509971973feab352dfc1a86217cc1fdb12d56823f04d863afef92003a
+homepage="https://www.sile-typesetter.org"
+distfiles="https://github.com/sile-typesetter/sile/releases/download/v${version}/sile-${version}.tar.bz2"
+checksum=d89d5ce7d2bf46fb062e5299ffd8b5d821dc3cb3462a0e7c1109edeee111d856
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" lua51 lua51-lpeg luaexpat lua51-zlib luafilesystem
- luasocket lua51-luasec"
+ hostmakedepends+=" lua51 lua51-lpeg luaexpat lua51-zlib lua51-luafilesystem
+ lua51-luasocket lua51-luasec"
fi
post_install() {
@@ -27,6 +31,7 @@ post_install() {
libtexpdf_package() {
short_desc="PDF library extracted from TeX's dvipdfmx"
pkg_install() {
+ # TODO: May not be necessary in v0.10.3
vmove "usr/lib/libtexpdf.so.*"
}
}
@@ -36,6 +41,7 @@ libtexpdf-devel_package() {
depends="libtexpdf-${version}_${revision}"
pkg_install() {
vmove usr/include
+ # TODO: May not be necessary in v0.10.3
vmove "usr/lib/*.so"
vmove "usr/lib/*.a"
}
From a0f97ca4f44903475e6f91540aa0b18720a5c099 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Fri, 24 Jul 2020 14:20:07 +0300
Subject: [PATCH 2/4] sile: Update to v0.10.9
---
srcpkgs/sile/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 0e9b0164f4e..503f4863ce4 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,6 +1,6 @@
# Template file for 'sile'
pkgname=sile
-version=0.10.3
+version=0.10.9
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://www.sile-typesetter.org"
distfiles="https://github.com/sile-typesetter/sile/releases/download/v${version}/sile-${version}.tar.bz2"
-checksum=d89d5ce7d2bf46fb062e5299ffd8b5d821dc3cb3462a0e7c1109edeee111d856
+checksum=44eaaf286b059b46eb51f28ef813d149538b06f4541c1eb7fb6faef26d60a564
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" lua51 lua51-lpeg luaexpat lua51-zlib lua51-luafilesystem
From 5b9d8dba0f7228a80adbb444803a14f9a7ba56b2 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Fri, 24 Jul 2020 16:10:25 +0300
Subject: [PATCH 3/4] sile: update dependencies to Lua 5.4, add configure flag
---
srcpkgs/sile/template | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 503f4863ce4..9e649d71868 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -3,15 +3,17 @@ pkgname=sile
version=0.10.9
revision=1
build_style=gnu-configure
+configure_args="--with-system-luarocks"
hostmakedepends="pkg-config"
-makedepends="fontconfig-devel harfbuzz-devel icu-devel lua51
- lua51-cassowary lua51-cliargs lua51-cosmo lua51-epnf lua51-linenoise lua51-penlight
- lua51-repl lua51-stdlib lua51-vstruct lua51-zlib lua51-bitlib lua51-lpeg
- lua51-luasec lua51-zlib lua51-luaexpat lua51-luafilesystem lua51-luasocket"
-depends="fonts-sil-gentium lua51
- lua51-cassowary lua51-cliargs lua51-cosmo lua51-epnf lua51-linenoise lua51-penlight
- lua51-repl lua51-stdlib lua51-vstruct lua51-zlib lua51-bitlib lua51-lpeg
- lua51-luasec lua51-zlib lua51-luaexpat lua51-luafilesystem lua51-luasocket"
+makedepends="fontconfig-devel harfbuzz-devel icu-devel lua54 lua54-cassowary
+ lua54-cosmo lua54-linenoise lua54-lpeg lua54-zlib lua54-cliargs
+ lua54-luaepnf lua54-luaexpat lua54-luafilesystem lua54-repl lua54-luasec
+ lua54-luasocket lua54-penlight lua54-stdlib lua54-vstruct"
+depends="fonts-sil-gentium libtexpdf lua54 lua54-cassowary lua54-cosmo
+ lua54-linenoise lua54-lpeg lua54-zlib lua54-cliargs lua54-luaepnf
+ lua54-luaexpat lua54-luafilesystem lua54-repl lua54-luasec lua54-luasocket
+ lua54-penlight lua54-stdlib lua54-vstruct"
+checkdepends="poppler"
short_desc="Modern typesetting system inspired by TeX"
maintainer="John <me@johnnynator.dev>"
license="MIT"
@@ -20,8 +22,8 @@ distfiles="https://github.com/sile-typesetter/sile/releases/download/v${version}
checksum=44eaaf286b059b46eb51f28ef813d149538b06f4541c1eb7fb6faef26d60a564
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" lua51 lua51-lpeg luaexpat lua51-zlib lua51-luafilesystem
- lua51-luasocket lua51-luasec"
+ hostmakedepends+=" lua54 lua54-lpeg lua54-luaexpat lua54-zlib
+ lua54-luafilesystem lua54-luasocket lua54-luasec"
fi
post_install() {
@@ -31,7 +33,6 @@ post_install() {
libtexpdf_package() {
short_desc="PDF library extracted from TeX's dvipdfmx"
pkg_install() {
- # TODO: May not be necessary in v0.10.3
vmove "usr/lib/libtexpdf.so.*"
}
}
@@ -41,8 +42,6 @@ libtexpdf-devel_package() {
depends="libtexpdf-${version}_${revision}"
pkg_install() {
vmove usr/include
- # TODO: May not be necessary in v0.10.3
vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
}
}
From 9fa93640ab33eaa32df66eed05a828341f856456 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Fri, 24 Jul 2020 16:51:59 +0300
Subject: [PATCH 4/4] lua-cassowary: Add template for cassowary.lua, required
by sile
---
srcpkgs/lua54-cassowary/template | 65 ++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
create mode 100644 srcpkgs/lua54-cassowary/template
diff --git a/srcpkgs/lua54-cassowary/template b/srcpkgs/lua54-cassowary/template
new file mode 100644
index 00000000000..0f0faad5f91
--- /dev/null
+++ b/srcpkgs/lua54-cassowary/template
@@ -0,0 +1,65 @@
+# Template file for 'lua54-cassowary'
+pkgname=lua54-cassowary
+version=2.2
+revision=1
+create_wrksrc=yes
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
+depends="lua54"
+_desc="A Lua port of the cassowary constraint solver engine"
+short_desc="${_desc} (5.4.x)"
+maintainer=""
+license="MIT"
+homepage="https://github.com/sile-typesetter/cassowary.lua"
+distfiles="https://github.com/sile-typesetter/cassowary.lua/archive/v${version}.tar.gz"
+checksum=e2f7774b6883581491b8f2c9d1655b2136bc24d837a9e43f515590a766ec4afd
+
+post_extract() {
+ mv "cassowary.lua-v${version}" lua54
+ cp -a lua54 lua53
+ cp -a lua54 lua52
+ cp -a lua54 lua51
+}
+
+do_install() {
+ for x in lua54 lua53 lua52 lua51; do
+ vinstall "$x/cassowary/init.lua" 755 "usr/lib/lua/5.${x#lua5}"
+ done
+ vlicense lua54/LICENSE
+}
+
+lua54-cjson_package() {
+ depends="lua54"
+ short_desc="${_desc} (5.4.x)"
+ pkg_install() {
+ vmove usr/lib/lua/5.4
+ vlicense ${wrksrc}/lua54/LICENSE
+ }
+}
+
+lua53-cjson_package() {
+ depends="lua53"
+ short_desc="${_desc} (5.3.x)"
+ pkg_install() {
+ vmove usr/lib/lua/5.3
+ vlicense ${wrksrc}/lua53/LICENSE
+ }
+}
+
+lua52-cjson_package() {
+ depends="lua52"
+ short_desc="${_desc} (5.2.x)"
+ pkg_install() {
+ vmove usr/lib/lua/5.2
+ vlicense ${wrksrc}/lua52/LICENSE
+ }
+}
+
+lua51-cjson_package() {
+ depends="lua51"
+ short_desc="${_desc} (5.1.x)"
+ pkg_install() {
+ vmove usr/lib/lua/5.1
+ vlicense ${wrksrc}/lua51/LICENSE
+ }
+}
next prev parent reply other threads:[~2020-07-24 13:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 11:28 [PR PATCH] Bump to v0.10.0 " voidlinux-github
2020-01-14 15:05 ` voidlinux-github
2020-01-14 15:28 ` voidlinux-github
2020-01-14 16:29 ` voidlinux-github
2020-01-14 16:37 ` voidlinux-github
2020-02-05 10:00 ` voidlinux-github
2020-07-24 11:21 ` [PR PATCH] [Updated] Bump to v0.10.3 " alerque
2020-07-24 11:22 ` alerque
2020-07-24 13:14 ` [PR PATCH] [Updated] " alerque
2020-07-24 13:42 ` alerque
2020-07-24 13:52 ` alerque [this message]
2020-12-20 2:10 ` [PR REVIEW] Bump to v0.10.9 " ericonr
2020-12-20 7:32 ` alerque
2021-01-29 3:49 ` ericonr
2021-11-06 21:47 ` [PR PATCH] [Closed]: " abenson
2021-11-06 21:47 ` abenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200724135224.VIAThFrucE2IEB5VodPfJ1bKp-VJ5V0V4d8skCTZsEw@z \
--to=alerque@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).