diff --git a/common/shlibs b/common/shlibs index ee8180c0824..76488f92f40 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3373,6 +3373,7 @@ libzck.so.1 zchunk-1.0.2_2 librec.so.1 librec1-1.8_1 libfixposix.so.3 libfixposix-0.4.3_1 libgerv.so.1 gerbv-2.6.2_1 +libtexpdf.so.0 libtexpdf-0.9.5_1 libupstart.so.1 libupstart-1.13.3_1 librtas.so.2 librtas-2.0.2_1 librtasevent.so.2 librtas-2.0.2_1 diff --git a/srcpkgs/libtexpdf b/srcpkgs/libtexpdf new file mode 120000 index 00000000000..be798c4933e --- /dev/null +++ b/srcpkgs/libtexpdf @@ -0,0 +1 @@ +sile \ No newline at end of file diff --git a/srcpkgs/libtexpdf-devel b/srcpkgs/libtexpdf-devel new file mode 120000 index 00000000000..be798c4933e --- /dev/null +++ b/srcpkgs/libtexpdf-devel @@ -0,0 +1 @@ +sile \ No newline at end of file diff --git a/srcpkgs/sile/patches/lua.patch b/srcpkgs/sile/patches/lua.patch index fabc9e1c50e..3ce28fc6b9b 100644 --- a/srcpkgs/sile/patches/lua.patch +++ b/srcpkgs/sile/patches/lua.patch @@ -1,8 +1,8 @@ ---- sile.in 2016-06-09 10:57:37.000000000 +0000 -+++ - 2018-06-21 20:22:13.514804438 +0000 +--- sile.in 2019-01-07 09:48:08.943943000 +0100 ++++ - 2019-01-07 23:26:28.635815999 +0100 @@ -1,4 +1,4 @@ -#!@LUA@ +#!@LUA@@LUA_VERSION@ - package.path = (os.getenv("SILE_PATH") and - os.getenv("SILE_PATH").."/?.lua" or "") .. ';?.lua;@SILE_PATH@/?.lua;@SILE_PATH@/lua-libraries/?.lua;@SILE_PATH@/lua-libraries/?/init.lua;lua-libraries/?.lua;lua-libraries/?/init.lua;' .. package.path - package.cpath = package.cpath .. ";core/?.@SHARED_LIB_EXT@;@SILE_LIB_PATH@/?.@SHARED_LIB_EXT@;" + SYSTEM_SILE_PATH = "@SILE_PATH@" + SYSTEM_SILE_LIB_PATH = "@SILE_LIB_PATH@" + SHARED_LIB_EXT = "@SHARED_LIB_EXT@" diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template index 3a730e62ff7..40f6d232d21 100644 --- a/srcpkgs/sile/template +++ b/srcpkgs/sile/template @@ -1,27 +1,54 @@ # Template file for 'sile' pkgname=sile -version=0.9.4 -revision=3 +version=0.9.5 +revision=1 +_libtexpdf_commit=1c9c3722d08e4e44695bdea41cd5a5118c8a120a build_style=gnu-configure -hostmakedepends="pkg-config" +hostmakedepends="pkg-config libtool automake" makedepends="harfbuzz-devel lua51-devel lua51-lpeg luaexpat - lua51-zlib luafilesystem" -depends="lua51-lpeg luaexpat lua51-zlib luafilesystem" + lua51-zlib luafilesystem luasocket lua51-luasec" +depends="lua51-lpeg luaexpat lua51-zlib luafilesystem luasocket + lua51-luasec" 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=1c696679e5243d0448705db86227eec57a000846f02a964f882b7978c46954d5 +distfiles="https://github.com/simoncozens/sile/archive/v${version}.tar.gz + https://github.com/simoncozens/libtexpdf/archive/${_libtexpdf_commit}.tar.gz" +checksum="89f28ee77a1eb928ca30060864b57007b4f447f08dc021dd0d013e363ccb9407 + 01b650ed383b7c68869bfe7f45213c1fbb6a7892d770ce9716aba787f8b380ad" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" lua51 lua51-lpeg luaexpat lua51-zlib luafilesystem" + hostmakedepends+=" lua51 lua51-lpeg luaexpat lua51-zlib luafilesystem + luasocket lua51-luasec" fi post_extract() { - sed 's/rm -f core/rm -f/' -i configure + mv ${wrksrc}/../libtexpdf-${_libtexpdf_commit}/* ${wrksrc}/libtexpdf + rm -rf ${wrksrc}/../libtexpdf-${_libtexpdf_commit} +} + +pre_configure() { + ./bootstrap.sh } post_install() { vlicense LICENSE } + +libtexpdf_package() { + short_desc="PDF library extracted from TeX's dvipdfmx" + pkg_install() { + vmove "usr/lib/libtexpdf.so.*" + } +} + +libtexpdf-devel_package() { + short_desc="PDF library extracted from TeX's dvipdfmx - (development files)" + depends="libtexpdf-${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +}