From d6a72b4c3105fdb271f0baca576a534068213c76 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 14 Jan 2020 14:23:33 +0300 Subject: [PATCH 1/3] 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 " 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 Date: Fri, 24 Jul 2020 14:20:07 +0300 Subject: [PATCH 2/3] 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 " 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 Date: Fri, 24 Jul 2020 16:10:25 +0300 Subject: [PATCH 3/3] 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 " 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" } }