wok-next rev 19986
softgun, lighttpd: update deps
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Oct 19 19:25:50 2017 +0200 (2017-10-19) |
parents | b04aa35b10fe |
children | d78f328fc5cb |
files | libwebkit/receipt lighttpd-modules/receipt lighttpd-ssl/receipt lighttpd/receipt softgun/receipt transfig/receipt |
line diff
1.1 --- a/libwebkit/receipt Wed Oct 18 13:40:04 2017 +0300 1.2 +++ b/libwebkit/receipt Thu Oct 19 19:25:50 2017 +0200 1.3 @@ -32,6 +32,7 @@ 1.4 # Rules to configure and make the package. 1.5 compile_rules() 1.6 { 1.7 + export CXXFLAGS="$CXXFLAGS -std=gnu++98" 1.8 # libwebkit does not like parallel builds. 1.9 export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/') 1.10 # fix Bug 84526: webkit-gtk-1.8.0 fails to build with --disable-video
2.1 --- a/lighttpd-modules/receipt Wed Oct 18 13:40:04 2017 +0300 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,39 +0,0 @@ 2.4 -# SliTaz package receipt. 2.5 - 2.6 -PACKAGE="lighttpd-modules" 2.7 -VERSION="1.4.35" 2.8 -CATEGORY="network" 2.9 -SHORT_DESC="Complementary modules for LightTPD Web server." 2.10 -MAINTAINER="pankso@slitaz.org" 2.11 -LICENSE="BSD" 2.12 -WANTED="lighttpd" 2.13 -WEB_SITE="http://www.lighttpd.net/" 2.14 -HOST_ARCH="i486 arm" 2.15 - 2.16 -DEPENDS="lighttpd bzip2 zlib" 2.17 - 2.18 -BASE_MODULES=" 2.19 -access 2.20 -accesslog 2.21 -alias 2.22 -cgi 2.23 -dirlisting 2.24 -indexfile 2.25 -staticfile 2.26 -rewrite 2.27 -status 2.28 -userdir" 2.29 - 2.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.31 -# On SliTaz Lighttpd runs as user/group : www/www or 80/80. 2.32 -genpkg_rules() 2.33 -{ 2.34 - # Modules. 2.35 - mkdir -p $fs/usr/ 2.36 - cp -a $install/usr/lib $fs/usr 2.37 - for module in $BASE_MODULES 2.38 - do 2.39 - rm -f $fs/usr/lib/lighttpd/mod_${module}.so 2.40 - done 2.41 - rm -f $fs/usr/lib/lighttpd/*.la 2.42 -}
3.1 --- a/lighttpd-ssl/receipt Wed Oct 18 13:40:04 2017 +0300 3.2 +++ b/lighttpd-ssl/receipt Thu Oct 19 19:25:50 2017 +0200 3.3 @@ -16,7 +16,7 @@ 3.4 HOST_ARCH="i486 arm" 3.5 3.6 DEPENDS="pcre openssl" 3.7 -BUILD_DEPENDS="pcre-dev bzip2-dev openssl-dev" 3.8 +BUILD_DEPENDS="pcre-dev bzip2-dev openssl-dev zlib-dev" 3.9 3.10 BASE_MODULES=" 3.11 access
4.1 --- a/lighttpd/receipt Wed Oct 18 13:40:04 2017 +0300 4.2 +++ b/lighttpd/receipt Thu Oct 19 19:25:50 2017 +0200 4.3 @@ -1,4 +1,4 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="lighttpd" 4.8 VERSION="1.4.35" 4.9 @@ -6,29 +6,12 @@ 4.10 SHORT_DESC="Fast and light HTTP Web server." 4.11 MAINTAINER="pankso@slitaz.org" 4.12 LICENSE="BSD" 4.13 -SUGGESTED="lighttpd-modules php perl python" 4.14 TARBALL="$PACKAGE-$VERSION.tar.xz" 4.15 WEB_SITE="http://www.lighttpd.net/" 4.16 WGET_URL="http://download.lighttpd.net/lighttpd/releases-${VERSION%.*}.x/$TARBALL" 4.17 -CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf" 4.18 HOST_ARCH="i486 arm" 4.19 4.20 -DEPENDS="pcre" 4.21 -BUILD_DEPENDS="pcre-dev bzip2-dev" 4.22 - 4.23 -# Modules include in this package. Other modules are splited in 4.24 -# the lighttpd-modules packages. 4.25 -BASE_MODULES=" 4.26 -access 4.27 -accesslog 4.28 -alias 4.29 -cgi 4.30 -dirlisting 4.31 -indexfile 4.32 -staticfile 4.33 -rewrite 4.34 -status 4.35 -userdir" 4.36 +BUILD_DEPENDS="pcre-dev bzip2-dev zlib-dev" 4.37 4.38 # Rules to configure and make the package. 4.39 compile_rules() 4.40 @@ -49,24 +32,67 @@ 4.41 # On SliTaz Lighttpd runs as user/group : www/www or 80/80. 4.42 genpkg_rules() 4.43 { 4.44 - mkdir -p $fs/usr 4.45 - #cp -a $install/usr/bin $fs/usr 4.46 - cp -a $install/usr/sbin $fs/usr 4.47 + case $PACKAGE in 4.48 + lighttpd) 4.49 + CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf" 4.50 + SUGGESTED="lighttpd-modules php perl python" 4.51 + DEPENDS="pcre" 4.52 + # Modules include in this package. Other modules are splited in 4.53 + # the lighttpd-modules packages. 4.54 + BASE_MODULES=" 4.55 +access 4.56 +accesslog 4.57 +alias 4.58 +cgi 4.59 +dirlisting 4.60 +indexfile 4.61 +staticfile 4.62 +rewrite 4.63 +status 4.64 +userdir" 4.65 + mkdir -p $fs/usr 4.66 + #cp -a $install/usr/bin $fs/usr 4.67 + cp -a $install/usr/sbin $fs/usr 4.68 4.69 - # Modules. 4.70 - mkdir -p $fs/usr/lib/lighttpd 4.71 - for module in $BASE_MODULES; do 4.72 - cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd 4.73 - echo -n "Copying : mod_${module}.so" && status 4.74 - done 4.75 + # Modules. 4.76 + mkdir -p $fs/usr/lib/lighttpd 4.77 + for module in $BASE_MODULES; do 4.78 + cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd 4.79 + echo -n "Copying : mod_${module}.so" && status 4.80 + done 4.81 4.82 - # Config file. 4.83 - cp -a $stuff/etc $fs 4.84 - chown -R 0.0 $fs/etc 4.85 + # Config file. 4.86 + cp -a $stuff/etc $fs 4.87 + chown -R 0.0 $fs/etc 4.88 4.89 - # Logs directory. 4.90 - mkdir -p $fs/var/log/lighttpd 4.91 - chown 80.80 $fs/var/log/lighttpd 4.92 + # Logs directory. 4.93 + mkdir -p $fs/var/log/lighttpd 4.94 + chown 80.80 $fs/var/log/lighttpd 4.95 + ;; 4.96 + lighttpd-modules) 4.97 + CAT="network|Complementary modules for LightTPD Web server." 4.98 + DEPENDS="lighttpd bzip2 zlib" 4.99 + BASE_MODULES=" 4.100 +access 4.101 +accesslog 4.102 +alias 4.103 +cgi 4.104 +dirlisting 4.105 +indexfile 4.106 +staticfile 4.107 +rewrite 4.108 +status 4.109 +userdir" 4.110 + # Modules. 4.111 + mkdir -p $fs/usr/ 4.112 + cp -a $install/usr/lib $fs/usr 4.113 + for module in $BASE_MODULES 4.114 + do 4.115 + rm -f $fs/usr/lib/lighttpd/mod_${module}.so 4.116 + done 4.117 + rm -f $fs/usr/lib/lighttpd/*.la 4.118 + ;; 4.119 + esac 4.120 } 4.121 4.122 # Make sur it as cross compile properly 4.123 @@ -77,7 +103,7 @@ 4.124 4.125 # Pre and post install commands for Tazpkg. 4.126 # We stop the server by default in case of upgarde. 4.127 -pre_install() 4.128 +pre_install_lighttpd() 4.129 { 4.130 [ -z "$1" ] && for i in httpd ngnix apache cherokee $PACKAGE ; do 4.131 [ -f /etc/init.d/$i ] && /etc/init.d/$i stop 4.132 @@ -88,7 +114,7 @@ 4.133 fi 4.134 } 4.135 4.136 -post_install() 4.137 +post_install_lighttpd() 4.138 { 4.139 # Restore original config. 4.140 if [ -d "$1/etc/lighttpd.bak" ]; then
5.1 --- a/softgun/receipt Wed Oct 18 13:40:04 2017 +0300 5.2 +++ b/softgun/receipt Thu Oct 19 19:25:50 2017 +0200 5.3 @@ -12,7 +12,7 @@ 5.4 TAGS="emulator arm" 5.5 5.6 DEPENDS="alsa-lib" 5.7 -BUILD_DEPENDS="alsa-lib-dev" 5.8 +BUILD_DEPENDS="alsa-lib-dev zlib-dev" 5.9 5.10 # Rules to configure and make the package. 5.11 compile_rules()
6.1 --- a/transfig/receipt Wed Oct 18 13:40:04 2017 +0300 6.2 +++ b/transfig/receipt Thu Oct 19 19:25:50 2017 +0200 6.3 @@ -21,6 +21,7 @@ 6.4 sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' fig2dev/dev/readpng.c 6.5 sed -i 's|info_ptr->valid|png_get_valid(png_ptr,info_ptr,PNG_INFO_gAMA)|' fig2dev/dev/readpng.c 6.6 sed -i 's/png_ptr->gamma/png_gamma(png_ptr)/' fig2dev/dev/readpng.c 6.7 + sed -i '/info_ptr->gamma/{s/info_ptr->//;s/^.*/{ double gamma;\npng_get_gAMA(png_ptr, info_ptr, \&gamma);\n& }/}' fig2dev/dev/readpng.c 6.8 xmkmf && 6.9 make Makefiles && 6.10 make &&