# HG changeset patch # User Pascal Bellard # Date 1508433950 -7200 # Node ID 8d3183aefad5f9b21df0f67d615cfe7d58b280a6 # Parent b04aa35b10fea33db4c27c7612792c8da64bcc1e softgun, lighttpd: update deps diff -r b04aa35b10fe -r 8d3183aefad5 libwebkit/receipt --- a/libwebkit/receipt Wed Oct 18 13:40:04 2017 +0300 +++ b/libwebkit/receipt Thu Oct 19 19:25:50 2017 +0200 @@ -32,6 +32,7 @@ # Rules to configure and make the package. compile_rules() { + export CXXFLAGS="$CXXFLAGS -std=gnu++98" # libwebkit does not like parallel builds. export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/') # fix Bug 84526: webkit-gtk-1.8.0 fails to build with --disable-video diff -r b04aa35b10fe -r 8d3183aefad5 lighttpd-modules/receipt --- a/lighttpd-modules/receipt Wed Oct 18 13:40:04 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="lighttpd-modules" -VERSION="1.4.35" -CATEGORY="network" -SHORT_DESC="Complementary modules for LightTPD Web server." -MAINTAINER="pankso@slitaz.org" -LICENSE="BSD" -WANTED="lighttpd" -WEB_SITE="http://www.lighttpd.net/" -HOST_ARCH="i486 arm" - -DEPENDS="lighttpd bzip2 zlib" - -BASE_MODULES=" -access -accesslog -alias -cgi -dirlisting -indexfile -staticfile -rewrite -status -userdir" - -# Rules to gen a SliTaz package suitable for Tazpkg. -# On SliTaz Lighttpd runs as user/group : www/www or 80/80. -genpkg_rules() -{ - # Modules. - mkdir -p $fs/usr/ - cp -a $install/usr/lib $fs/usr - for module in $BASE_MODULES - do - rm -f $fs/usr/lib/lighttpd/mod_${module}.so - done - rm -f $fs/usr/lib/lighttpd/*.la -} diff -r b04aa35b10fe -r 8d3183aefad5 lighttpd-ssl/receipt --- a/lighttpd-ssl/receipt Wed Oct 18 13:40:04 2017 +0300 +++ b/lighttpd-ssl/receipt Thu Oct 19 19:25:50 2017 +0200 @@ -16,7 +16,7 @@ HOST_ARCH="i486 arm" DEPENDS="pcre openssl" -BUILD_DEPENDS="pcre-dev bzip2-dev openssl-dev" +BUILD_DEPENDS="pcre-dev bzip2-dev openssl-dev zlib-dev" BASE_MODULES=" access diff -r b04aa35b10fe -r 8d3183aefad5 lighttpd/receipt --- a/lighttpd/receipt Wed Oct 18 13:40:04 2017 +0300 +++ b/lighttpd/receipt Thu Oct 19 19:25:50 2017 +0200 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="lighttpd" VERSION="1.4.35" @@ -6,29 +6,12 @@ SHORT_DESC="Fast and light HTTP Web server." MAINTAINER="pankso@slitaz.org" LICENSE="BSD" -SUGGESTED="lighttpd-modules php perl python" TARBALL="$PACKAGE-$VERSION.tar.xz" WEB_SITE="http://www.lighttpd.net/" WGET_URL="http://download.lighttpd.net/lighttpd/releases-${VERSION%.*}.x/$TARBALL" -CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf" HOST_ARCH="i486 arm" -DEPENDS="pcre" -BUILD_DEPENDS="pcre-dev bzip2-dev" - -# Modules include in this package. Other modules are splited in -# the lighttpd-modules packages. -BASE_MODULES=" -access -accesslog -alias -cgi -dirlisting -indexfile -staticfile -rewrite -status -userdir" +BUILD_DEPENDS="pcre-dev bzip2-dev zlib-dev" # Rules to configure and make the package. compile_rules() @@ -49,24 +32,67 @@ # On SliTaz Lighttpd runs as user/group : www/www or 80/80. genpkg_rules() { - mkdir -p $fs/usr - #cp -a $install/usr/bin $fs/usr - cp -a $install/usr/sbin $fs/usr + case $PACKAGE in + lighttpd) + CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf" + SUGGESTED="lighttpd-modules php perl python" + DEPENDS="pcre" + # Modules include in this package. Other modules are splited in + # the lighttpd-modules packages. + BASE_MODULES=" +access +accesslog +alias +cgi +dirlisting +indexfile +staticfile +rewrite +status +userdir" + mkdir -p $fs/usr + #cp -a $install/usr/bin $fs/usr + cp -a $install/usr/sbin $fs/usr - # Modules. - mkdir -p $fs/usr/lib/lighttpd - for module in $BASE_MODULES; do - cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd - echo -n "Copying : mod_${module}.so" && status - done + # Modules. + mkdir -p $fs/usr/lib/lighttpd + for module in $BASE_MODULES; do + cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd + echo -n "Copying : mod_${module}.so" && status + done - # Config file. - cp -a $stuff/etc $fs - chown -R 0.0 $fs/etc + # Config file. + cp -a $stuff/etc $fs + chown -R 0.0 $fs/etc - # Logs directory. - mkdir -p $fs/var/log/lighttpd - chown 80.80 $fs/var/log/lighttpd + # Logs directory. + mkdir -p $fs/var/log/lighttpd + chown 80.80 $fs/var/log/lighttpd + ;; + lighttpd-modules) + CAT="network|Complementary modules for LightTPD Web server." + DEPENDS="lighttpd bzip2 zlib" + BASE_MODULES=" +access +accesslog +alias +cgi +dirlisting +indexfile +staticfile +rewrite +status +userdir" + # Modules. + mkdir -p $fs/usr/ + cp -a $install/usr/lib $fs/usr + for module in $BASE_MODULES + do + rm -f $fs/usr/lib/lighttpd/mod_${module}.so + done + rm -f $fs/usr/lib/lighttpd/*.la + ;; + esac } # Make sur it as cross compile properly @@ -77,7 +103,7 @@ # Pre and post install commands for Tazpkg. # We stop the server by default in case of upgarde. -pre_install() +pre_install_lighttpd() { [ -z "$1" ] && for i in httpd ngnix apache cherokee $PACKAGE ; do [ -f /etc/init.d/$i ] && /etc/init.d/$i stop @@ -88,7 +114,7 @@ fi } -post_install() +post_install_lighttpd() { # Restore original config. if [ -d "$1/etc/lighttpd.bak" ]; then diff -r b04aa35b10fe -r 8d3183aefad5 softgun/receipt --- a/softgun/receipt Wed Oct 18 13:40:04 2017 +0300 +++ b/softgun/receipt Thu Oct 19 19:25:50 2017 +0200 @@ -12,7 +12,7 @@ TAGS="emulator arm" DEPENDS="alsa-lib" -BUILD_DEPENDS="alsa-lib-dev" +BUILD_DEPENDS="alsa-lib-dev zlib-dev" # Rules to configure and make the package. compile_rules() diff -r b04aa35b10fe -r 8d3183aefad5 transfig/receipt --- a/transfig/receipt Wed Oct 18 13:40:04 2017 +0300 +++ b/transfig/receipt Thu Oct 19 19:25:50 2017 +0200 @@ -21,6 +21,7 @@ sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' fig2dev/dev/readpng.c sed -i 's|info_ptr->valid|png_get_valid(png_ptr,info_ptr,PNG_INFO_gAMA)|' fig2dev/dev/readpng.c sed -i 's/png_ptr->gamma/png_gamma(png_ptr)/' fig2dev/dev/readpng.c + sed -i '/info_ptr->gamma/{s/info_ptr->//;s/^.*/{ double gamma;\npng_get_gAMA(png_ptr, info_ptr, \&gamma);\n& }/}' fig2dev/dev/readpng.c xmkmf && make Makefiles && make &&