tidy5: update to 5.1.25

This commit is contained in:
Jürgen Buchmüller 2015-11-25 10:20:37 +01:00
parent d8cbdfc786
commit e04a639a0e
3 changed files with 20 additions and 19 deletions

View file

@ -2104,7 +2104,7 @@ libgegl-sc-0.3.so gegl3-0.3.0_1
libprocps.so.5 procps-ng-3.3.11_1 libprocps.so.5 procps-ng-3.3.11_1
libskarnet.so.2.3 skalibs-2.3.7.0_1 libskarnet.so.2.3 skalibs-2.3.7.0_1
libportablexdr.so.0 portablexdr-4.9.1_1 libportablexdr.so.0 portablexdr-4.9.1_1
libtidy5.so.4 libtidy5-4.9.30_1 libtidy.so.5 libtidy5-5.1.25_1
libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
libQupZilla.so.1 qupzilla-1.8.6_1 libQupZilla.so.1 qupzilla-1.8.6_1
libinjeqt.so.0 injeqt-1.0.1_1 libinjeqt.so.0 injeqt-1.0.1_1

View file

@ -1,20 +1,19 @@
--- CMakeLists.txt.orig --- CMakeLists.txt 2015-11-23 16:07:04.000000000 +0100
+++ CMakeLists.txt +++ CMakeLists.txt 2015-11-25 09:59:50.944941514 +0100
@@ -201,7 +201,7 @@ @@ -238,7 +238,7 @@
# run built EXE to generate xml output # run built EXE to generate xml output
add_custom_command( add_custom_command(
TARGET man TARGET man
- COMMAND ${CMAKE_BINARY_DIR}/${LIB_NAME} -xml-help > ${TIDYHELP} - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} -xml-help > ${TIDYHELP}
+ COMMAND ${CMAKE_SOURCE_DIR}/tidy5 -xml-help > ${TIDYHELP} + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tidy -xml-help > ${TIDYHELP}
COMMENT "Generate ${TIDYHELP}" COMMENT "Generate ${TIDYHELP}"
VERBATIM VERBATIM
) )
@@ -209,7 +209,7 @@ @@ -247,6 +247,6 @@
# run built EXE to generate more xml output
add_custom_command( add_custom_command(
TARGET man TARGET man
- COMMAND ${CMAKE_BINARY_DIR}/${LIB_NAME} -xml-config > ${TIDYCONFIG} - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} -xml-config > ${TIDYCONFIG}
+ COMMAND ${CMAKE_SOURCE_DIR}/tidy5 -xml-config > ${TIDYCONFIG} + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tidy -xml-config > ${TIDYCONFIG}
COMMENT "Generate ${TIDYCONFIG}" COMMENT "Generate ${TIDYCONFIG}"
VERBATIM VERBATIM
) )

View file

@ -2,9 +2,9 @@
# This project has an identity crisis, it's "Tidy", # This project has an identity crisis, it's "Tidy",
# "HTML Tidy" and "Tidy HTML5". Binaries are tidy5. # "HTML Tidy" and "Tidy HTML5". Binaries are tidy5.
pkgname=tidy5 pkgname=tidy5
_reponame=tidy-html5 version=5.1.25
version=4.9.36
revision=1 revision=1
_reponame=tidy-html5
wrksrc=${_reponame}-${version} wrksrc=${_reponame}-${version}
build_style=cmake build_style=cmake
cmake_builddir=build/cmake cmake_builddir=build/cmake
@ -14,11 +14,11 @@ maintainer="beefcurtains <beefcurtains@voidlinux.eu>"
license="W3C" license="W3C"
homepage="http://www.htacg.org/${_reponame}/" homepage="http://www.htacg.org/${_reponame}/"
distfiles="https://github.com/htacg/${_reponame}/archive/${version}.tar.gz" distfiles="https://github.com/htacg/${_reponame}/archive/${version}.tar.gz"
checksum=687ae85d52e9f368b3d74031b13fa4f346f77c1c7a50e6507a1db3792778d522 checksum=be81e967537984fbd207b4b19d02e7be73cbf201f07bf55aa5560c9b1d19b106
pre_configure() { pre_configure() {
# the $(man) target requires tidy5 to run on the host # the $(man) target requires tidy5 to run on the host
ln -s ${cmake_builddir}/${pkgname} ln -s ${cmake_builddir}/tidy
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
rm ${pkgname} rm ${pkgname}
cd ${cmake_builddir} cd ${cmake_builddir}
@ -26,20 +26,22 @@ pre_configure() {
env - PATH=/usr/bin cmake -DBUILD_SHARED_LIB:BOOL=FALSE ${wrksrc} env - PATH=/usr/bin cmake -DBUILD_SHARED_LIB:BOOL=FALSE ${wrksrc}
make ${makejobs} ${pkgname} make ${makejobs} ${pkgname}
cp ${pkgname} ${wrksrc} cp tidy ${wrksrc}
cd ${wrksrc} cd ${wrksrc}
rm -rf ${cmake_builddir} rm -rf ${cmake_builddir}
fi fi
} }
post_install() { post_install() {
vlicense LICENSE.txt LICENSE vlicense README/LICENSE.txt LICENSE
mv ${DESTDIR}/usr/bin/tidy{,5}
mv ${DESTDIR}/usr/share/man/man1/tidy{,5}.1
} }
libtidy5_package() { libtidy5_package() {
short_desc+=" - library files" short_desc+=" - library files"
pkg_install() { pkg_install() {
vmove "usr/lib/*.so.*" vmove usr/lib/*.so.*
} }
} }
@ -48,7 +50,7 @@ libtidy5-devel_package() {
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove "usr/lib/*.a" vmove usr/lib/*.a
vmove "usr/lib/*.so" vmove usr/lib/*.so
} }
} }