wok-next rev 20997
Update netsurf, use combined sources, separated packages no more required
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Oct 04 19:53:01 2018 +0300 (2018-10-04) |
| parents | f09bb1f3629e |
| children | 782016c0454d |
| files | libcss/receipt libcss/stuff/patches/gcc7.patch libcss/stuff/patches/series libdom/receipt libhubbub/receipt libnsbmp/receipt libnsgif/receipt libnslayout/receipt libnslog/receipt libnspsl/receipt libnsutils/receipt libparserutils/receipt libsvgtiny/receipt libutf8proc/receipt libwapcaplet/receipt netsurf-buildsystem/receipt netsurf/.icon.png netsurf/receipt netsurf/stuff/netsurf netsurf/stuff/oldstuff/Makefile.config netsurf/stuff/oldstuff/Makefile.defaults netsurf/stuff/oldstuff/netsurf.desktop netsurf/stuff/oldstuff/netsurf.png netsurf/stuff/oldstuff/webhome/netsurf.html netsurf/stuff/oldstuff/webhome/style.css netsurf/stuff/patches/headers.patch netsurf/stuff/patches/netsurf-3.6-CFLAGS.patch netsurf/stuff/patches/netsurf-3.6-conditionally-include-image-headers.patch netsurf/stuff/patches/netsurf-3.6-gstreamer.patch netsurf/stuff/patches/netsurf-3.6-pdf-writer.patch netsurf/stuff/patches/openssl.patch netsurf/stuff/patches/series nsgenbind/receipt |
line diff
1.1 --- a/libcss/receipt Thu Oct 04 16:01:47 2018 +0300 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,49 +0,0 @@ 1.4 -# SliTaz package receipt v2. 1.5 - 1.6 -PACKAGE="libcss" 1.7 -COMMIT="" 1.8 -VERSION="0.7.0" 1.9 -CATEGORY="system-tools" 1.10 -SHORT_DESC="CSS parser and selection engine" 1.11 -MAINTAINER="erjo@slitaz.org" 1.12 -LICENSE="MIT" 1.13 -WEB_SITE="http://www.netsurf-browser.org/projects/libcss/" 1.14 - 1.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 1.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 1.17 -if [ -n "$COMMIT" ]; then 1.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 1.19 -else 1.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 1.21 -fi 1.22 - 1.23 -BUILD_DEPENDS="netsurf-buildsystem libwapcaplet-dev libparserutils-dev" 1.24 -SPLIT="libcss-dev" 1.25 - 1.26 -compile_rules() { 1.27 - [ -z "$COMMIT" ] && cd $VERSION 1.28 - 1.29 - sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile 1.30 - export CFLAGS="-Wno-error=unused-but-set-variable" 1.31 - 1.32 - make \ 1.33 - PREFIX=/usr \ 1.34 - LIBDIR=lib \ 1.35 - INCLUDEDIR=include \ 1.36 - COMPONENT_TYPE=lib-shared \ 1.37 - install 1.38 -} 1.39 - 1.40 -genpkg_rules() { 1.41 - case $PACKAGE in 1.42 - libcss) 1.43 - copy @std 1.44 - DEPENDS="libparserutils libwapcaplet" 1.45 - ;; 1.46 - *-dev) 1.47 - copy @dev 1.48 - DEPENDS="libcss libparserutils-dev libwapcaplet-dev" 1.49 - ;; 1.50 - esac 1.51 - TAGS="netsurf" 1.52 -}
2.1 --- a/libcss/stuff/patches/gcc7.patch Thu Oct 04 16:01:47 2018 +0300 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,34 +0,0 @@ 2.4 ---- a/0.7.0/src/parse/parse.c 2.5 -+++ b/0.7.0/src/parse/parse.c 2.6 -@@ -2098,8 +2098,8 @@ 2.7 - ; 2.8 - 2.9 - state->substate = Go; 2.10 -- /* Fall through */ 2.11 - } 2.12 -+ /* FALLTHROUGH */ 2.13 - case Go: 2.14 - while (1) { 2.15 - char want; 2.16 -@@ -2296,8 +2296,8 @@ 2.17 - ; 2.18 - 2.19 - state->substate = Go; 2.20 -- /* Fall through */ 2.21 - } 2.22 -+ /* FALLTHROUGH */ 2.23 - case Go: 2.24 - while (1) { 2.25 - char want; 2.26 ---- a/0.7.0/src/select/arena_hash.h 2.27 -+++ b/0.7.0/src/select/arena_hash.h 2.28 -@@ -50,7 +50,9 @@ 2.29 - /* Hash any left over bytes */ 2.30 - switch (len) { 2.31 - case 3: h ^= data[2] << 16; 2.32 -+ /* FALLTHROUGH */ 2.33 - case 2: h ^= data[1] << 8; 2.34 -+ /* FALLTHROUGH */ 2.35 - case 1: h ^= data[0]; 2.36 - h *= m; 2.37 - }
3.1 --- a/libcss/stuff/patches/series Thu Oct 04 16:01:47 2018 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,1 +0,0 @@ 3.4 -gcc7.patch
4.1 --- a/libdom/receipt Thu Oct 04 16:01:47 2018 +0300 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,50 +0,0 @@ 4.4 -# SliTaz package receipt v2. 4.5 - 4.6 -PACKAGE="libdom" 4.7 -COMMIT="" 4.8 -VERSION="0.3.3" 4.9 -CATEGORY="web" 4.10 -SHORT_DESC="Implementation of the W3C DOM" 4.11 -MAINTAINER="al.bobylev@gmail.com" 4.12 -LICENSE="MIT" 4.13 -WEB_SITE="http://www.netsurf-browser.org/projects/libdom/" 4.14 - 4.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 4.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 4.17 -if [ -n "$COMMIT" ]; then 4.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 4.19 -else 4.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 4.21 -fi 4.22 - 4.23 -BUILD_DEPENDS="netsurf-buildsystem libparserutils-dev libwapcaplet-dev \ 4.24 -libhubbub-dev expat-dev" 4.25 -SPLIT="libdom-dev" 4.26 - 4.27 -compile_rules() { 4.28 - [ -z "$COMMIT" ] && cd $VERSION 4.29 - 4.30 - sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile 4.31 - export CFLAGS='-Wno-error=unused-but-set-variable' 4.32 - 4.33 - make \ 4.34 - PREFIX=/usr \ 4.35 - LIBDIR=lib \ 4.36 - INCLUDEDIR=include \ 4.37 - COMPONENT_TYPE=lib-shared \ 4.38 - install 4.39 -} 4.40 - 4.41 -genpkg_rules() { 4.42 - case $PACKAGE in 4.43 - libdom) 4.44 - copy @std 4.45 - DEPENDS="expat libhubbub libparserutils libwapcaplet" 4.46 - ;; 4.47 - *-dev) 4.48 - copy @dev 4.49 - DEPENDS="libdom expat-dev libhubbub-dev" 4.50 - ;; 4.51 - esac 4.52 - TAGS="netsurf" 4.53 -}
5.1 --- a/libhubbub/receipt Thu Oct 04 16:01:47 2018 +0300 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,48 +0,0 @@ 5.4 -# SliTaz package receipt v2. 5.5 - 5.6 -PACKAGE="libhubbub" 5.7 -COMMIT="" 5.8 -VERSION="0.3.5" 5.9 -CATEGORY="system-tools" 5.10 -SHORT_DESC="Hubbub is an HTML5 compliant parsing library, written in C" 5.11 -MAINTAINER="pankso@slitaz.org" 5.12 -LICENSE="MIT" 5.13 -WEB_SITE="http://www.netsurf-browser.org/projects/hubbub/" 5.14 - 5.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 5.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 5.17 -if [ -n "$COMMIT" ]; then 5.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 5.19 -else 5.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 5.21 -fi 5.22 - 5.23 -BUILD_DEPENDS="netsurf-buildsystem libparserutils-dev" 5.24 -SPLIT="libhubbub-dev" 5.25 - 5.26 -compile_rules() { 5.27 - [ -z "$COMMIT" ] && cd $VERSION 5.28 - 5.29 - make \ 5.30 - PREFIX=/usr \ 5.31 - LIBDIR=lib \ 5.32 - INCLUDEDIR=include \ 5.33 - COMPONENT_TYPE=lib-shared \ 5.34 - install 5.35 -} 5.36 - 5.37 -genpkg_rules() { 5.38 - case $PACKAGE in 5.39 - libhubbub) 5.40 - copy @std 5.41 - DEPENDS="libparserutils" 5.42 - PROVIDE="hubbub" # old package name 5.43 - ;; 5.44 - *-dev) 5.45 - copy @dev 5.46 - DEPENDS="libhubbub libparserutils-dev" 5.47 - PROVIDE="hubbub-dev" 5.48 - ;; 5.49 - esac 5.50 - TAGS="netsurf" 5.51 -}
6.1 --- a/libnsbmp/receipt Thu Oct 04 16:01:47 2018 +0300 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,40 +0,0 @@ 6.4 -# SliTaz package receipt v2. 6.5 - 6.6 -PACKAGE="libnsbmp" 6.7 -COMMIT="" 6.8 -VERSION="0.1.5" 6.9 -CATEGORY="libs" 6.10 -SHORT_DESC="Decoding library for BMP and ICO image file formats" 6.11 -MAINTAINER="al.bobylev@gmail.com" 6.12 -LICENSE="MIT" 6.13 -WEB_SITE="http://www.netsurf-browser.org/projects/libnsbmp/" 6.14 - 6.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 6.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 6.17 -if [ -n "$COMMIT" ]; then 6.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 6.19 -else 6.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 6.21 -fi 6.22 - 6.23 -BUILD_DEPENDS="netsurf-buildsystem" 6.24 -SPLIT="libnsbmp-dev" 6.25 - 6.26 -compile_rules() { 6.27 - [ -z "$COMMIT" ] && cd $VERSION 6.28 - 6.29 - make \ 6.30 - PREFIX=/usr \ 6.31 - LIBDIR=lib \ 6.32 - INCLUDEDIR=include \ 6.33 - COMPONENT_TYPE=lib-shared \ 6.34 - install 6.35 -} 6.36 - 6.37 -genpkg_rules() { 6.38 - case $PACKAGE in 6.39 - libnsbmp) copy @std;; 6.40 - *-dev) copy @dev;; 6.41 - esac 6.42 - TAGS="netsurf" 6.43 -}
7.1 --- a/libnsgif/receipt Thu Oct 04 16:01:47 2018 +0300 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,42 +0,0 @@ 7.4 -# SliTaz package receipt v2. 7.5 - 7.6 -PACKAGE="libnsgif" 7.7 -COMMIT="" 7.8 -VERSION="0.2.1" 7.9 -CATEGORY="libs" 7.10 -SHORT_DESC="Decoding library for the GIF image file format" 7.11 -MAINTAINER="pankso@slitaz.org" 7.12 -LICENSE="MIT" 7.13 -WEB_SITE="http://www.netsurf-browser.org/projects/libnsgif/" 7.14 - 7.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 7.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 7.17 -if [ -n "$COMMIT" ]; then 7.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 7.19 -else 7.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 7.21 -fi 7.22 - 7.23 -BUILD_DEPENDS="netsurf-buildsystem" 7.24 -SPLIT="libnsgif-dev" 7.25 - 7.26 -compile_rules() { 7.27 - [ -z "$COMMIT" ] && cd $VERSION 7.28 - 7.29 - export CFLAGS="$CFLAGS -fno-strict-aliasing" 7.30 - 7.31 - make \ 7.32 - PREFIX=/usr \ 7.33 - LIBDIR=lib \ 7.34 - INCLUDEDIR=include \ 7.35 - COMPONENT_TYPE=lib-shared \ 7.36 - install 7.37 -} 7.38 - 7.39 -genpkg_rules() { 7.40 - case $PACKAGE in 7.41 - libnsgif) copy @std;; 7.42 - *-dev) copy @dev;; 7.43 - esac 7.44 - TAGS="netsurf" 7.45 -}
8.1 --- a/libnslayout/receipt Thu Oct 04 16:01:47 2018 +0300 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,48 +0,0 @@ 8.4 -# SliTaz package receipt v2. 8.5 - 8.6 -PACKAGE="libnslayout" 8.7 -COMMIT="b77ae8ab7d1ce435d8afd3c77613c5a56c477025" 8.8 -VERSION="0-170617" 8.9 -CATEGORY="libs" 8.10 -SHORT_DESC="NetSurf Layout Engine" 8.11 -MAINTAINER="al.bobylev@gmail.com" 8.12 -LICENSE="MIT" 8.13 -WEB_SITE="http://source.netsurf-browser.org/libnslayout.git/" 8.14 - 8.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 8.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 8.17 -if [ -n "$COMMIT" ]; then 8.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 8.19 -else 8.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 8.21 -fi 8.22 - 8.23 -BUILD_DEPENDS="netsurf-buildsystem libcss-dev libdom-dev libwapcaplet-dev \ 8.24 -libparserutils-dev" 8.25 -SPLIT="libnslayout-dev" 8.26 - 8.27 -compile_rules() { 8.28 - [ -z "$COMMIT" ] && cd $VERSION 8.29 - 8.30 - make \ 8.31 - PREFIX=/usr \ 8.32 - LIBDIR=lib \ 8.33 - INCLUDEDIR=include \ 8.34 - COMPONENT_TYPE=lib-shared \ 8.35 - install 8.36 -} 8.37 - 8.38 -genpkg_rules() { 8.39 - case $PACKAGE in 8.40 - libnslayout) 8.41 - copy @std 8.42 - DEPENDS="expat libcss libdom libhubbub libparserutils libwapcaplet" 8.43 - ;; 8.44 - *-dev) 8.45 - copy @dev 8.46 - DEPENDS="libnslayout libcss-dev libdom-dev libparserutils-dev \ 8.47 - libwapcaplet-dev" 8.48 - ;; 8.49 - esac 8.50 - TAGS="netsurf" 8.51 -}
9.1 --- a/libnslog/receipt Thu Oct 04 16:01:47 2018 +0300 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,40 +0,0 @@ 9.4 -# SliTaz package receipt v2. 9.5 - 9.6 -PACKAGE="libnslog" 9.7 -COMMIT="" 9.8 -VERSION="0.1.0" 9.9 -CATEGORY="libs" 9.10 -SHORT_DESC="NetSurf Parametric Logging Library" 9.11 -MAINTAINER="al.bobylev@gmail.com" 9.12 -LICENSE="MIT" 9.13 -WEB_SITE="http://source.netsurf-browser.org/libnslog.git/" 9.14 - 9.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 9.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 9.17 -if [ -n "$COMMIT" ]; then 9.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 9.19 -else 9.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 9.21 -fi 9.22 - 9.23 -BUILD_DEPENDS="netsurf-buildsystem" 9.24 -SPLIT="libnslog-dev" 9.25 - 9.26 -compile_rules() { 9.27 - [ -z "$COMMIT" ] && cd $VERSION 9.28 - 9.29 - make \ 9.30 - PREFIX=/usr \ 9.31 - LIBDIR=lib \ 9.32 - INCLUDEDIR=include \ 9.33 - COMPONENT_TYPE=lib-shared \ 9.34 - install 9.35 -} 9.36 - 9.37 -genpkg_rules() { 9.38 - case $PACKAGE in 9.39 - libnslog) copy @std;; 9.40 - *-dev) copy @dev;; 9.41 - esac 9.42 - TAGS="netsurf" 9.43 -}
10.1 --- a/libnspsl/receipt Thu Oct 04 16:01:47 2018 +0300 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,40 +0,0 @@ 10.4 -# SliTaz package receipt v2. 10.5 - 10.6 -PACKAGE="libnspsl" 10.7 -COMMIT="" 10.8 -VERSION="0.1.2" 10.9 -CATEGORY="libs" 10.10 -SHORT_DESC="NetSurf public suffix list handling" 10.11 -MAINTAINER="al.bobylev@gmail.com" 10.12 -LICENSE="MIT" 10.13 -WEB_SITE="http://source.netsurf-browser.org/libnspsl.git/" 10.14 - 10.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 10.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 10.17 -if [ -n "$COMMIT" ]; then 10.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 10.19 -else 10.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 10.21 -fi 10.22 - 10.23 -BUILD_DEPENDS="netsurf-buildsystem" 10.24 -SPLIT="libnspsl-dev" 10.25 - 10.26 -compile_rules() { 10.27 - [ -z "$COMMIT" ] && cd $VERSION 10.28 - 10.29 - make \ 10.30 - PREFIX=/usr \ 10.31 - LIBDIR=lib \ 10.32 - INCLUDEDIR=include \ 10.33 - COMPONENT_TYPE=lib-shared \ 10.34 - install 10.35 -} 10.36 - 10.37 -genpkg_rules() { 10.38 - case $PACKAGE in 10.39 - libnspsl) copy @std;; 10.40 - *-dev) copy @dev;; 10.41 - esac 10.42 - TAGS="netsurf" 10.43 -}
11.1 --- a/libnsutils/receipt Thu Oct 04 16:01:47 2018 +0300 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,40 +0,0 @@ 11.4 -# SliTaz package receipt v2. 11.5 - 11.6 -PACKAGE="libnsutils" 11.7 -COMMIT="" 11.8 -VERSION="0.0.3" 11.9 -CATEGORY="utilities" 11.10 -SHORT_DESC="NetSurf Utilities" 11.11 -MAINTAINER="al.bobylev@gmail.com" 11.12 -LICENSE="MIT" 11.13 -WEB_SITE="http://source.netsurf-browser.org/libnsutils.git/" 11.14 - 11.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 11.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 11.17 -if [ -n "$COMMIT" ]; then 11.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 11.19 -else 11.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 11.21 -fi 11.22 - 11.23 -BUILD_DEPENDS="netsurf-buildsystem" 11.24 -SPLIT="libnsutils-dev" 11.25 - 11.26 -compile_rules() { 11.27 - [ -z "$COMMIT" ] && cd $VERSION 11.28 - 11.29 - make \ 11.30 - PREFIX=/usr \ 11.31 - LIBDIR=lib \ 11.32 - INCLUDEDIR=include \ 11.33 - COMPONENT_TYPE=lib-shared \ 11.34 - install 11.35 -} 11.36 - 11.37 -genpkg_rules() { 11.38 - case $PACKAGE in 11.39 - libnsutils) copy @std;; 11.40 - *-dev) copy @dev;; 11.41 - esac 11.42 - TAGS="netsurf" 11.43 -}
12.1 --- a/libparserutils/receipt Thu Oct 04 16:01:47 2018 +0300 12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 12.3 @@ -1,43 +0,0 @@ 12.4 -# SliTaz package receipt v2. 12.5 - 12.6 -PACKAGE="libparserutils" 12.7 -COMMIT="" 12.8 -VERSION="0.2.4" 12.9 -CATEGORY="system-tools" 12.10 -SHORT_DESC="Library for building efficient parsers" 12.11 -MAINTAINER="pankso@slitaz.org" 12.12 -LICENSE="MIT" 12.13 -WEB_SITE="http://www.netsurf-browser.org/projects/libparserutils/" 12.14 - 12.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 12.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 12.17 -if [ -n "$COMMIT" ]; then 12.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 12.19 -else 12.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 12.21 -fi 12.22 - 12.23 -BUILD_DEPENDS="netsurf-buildsystem" 12.24 -SPLIT="libparserutils-dev" 12.25 - 12.26 -compile_rules() { 12.27 - [ -z "$COMMIT" ] && cd $VERSION 12.28 - 12.29 - sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile 12.30 - echo 'CFLAGS += -DWITH_ICONV_FILTER' > Makefile.config.override 12.31 - 12.32 - make \ 12.33 - PREFIX=/usr \ 12.34 - LIBDIR=lib \ 12.35 - INCLUDEDIR=include \ 12.36 - COMPONENT_TYPE=lib-shared \ 12.37 - install 12.38 -} 12.39 - 12.40 -genpkg_rules() { 12.41 - case $PACKAGE in 12.42 - libparserutils) copy @std;; 12.43 - *-dev) copy @dev;; 12.44 - esac 12.45 - TAGS="netsurf" 12.46 -}
13.1 --- a/libsvgtiny/receipt Thu Oct 04 16:01:47 2018 +0300 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,49 +0,0 @@ 13.4 -# SliTaz package receipt v2. 13.5 - 13.6 -PACKAGE="libsvgtiny" 13.7 -COMMIT="" 13.8 -VERSION="0.1.6" 13.9 -CATEGORY="libs" 13.10 -SHORT_DESC="SVG Tiny library" 13.11 -MAINTAINER="al.bobylev@gmail.com" 13.12 -LICENSE="MIT" 13.13 -WEB_SITE="http://www.netsurf-browser.org/projects/libsvgtiny/" 13.14 - 13.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 13.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 13.17 -if [ -n "$COMMIT" ]; then 13.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 13.19 -else 13.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 13.21 -fi 13.22 - 13.23 -BUILD_DEPENDS="netsurf-buildsystem libdom-dev libwapcaplet-dev gperf" 13.24 -SPLIT="libsvgtiny-dev" 13.25 - 13.26 -compile_rules() { 13.27 - [ -z "$COMMIT" ] && cd $VERSION 13.28 - 13.29 - sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile 13.30 - export CFLAGS="-Wno-error=unused-but-set-variable" 13.31 - 13.32 - make \ 13.33 - PREFIX=/usr \ 13.34 - LIBDIR=lib \ 13.35 - INCLUDEDIR=include \ 13.36 - COMPONENT_TYPE=lib-shared \ 13.37 - install 13.38 -} 13.39 - 13.40 -genpkg_rules() { 13.41 - case $PACKAGE in 13.42 - libsvgtiny) 13.43 - copy @std 13.44 - DEPENDS="expat libdom libhubbub libparserutils libwapcaplet" 13.45 - ;; 13.46 - *-dev) 13.47 - copy @dev 13.48 - DEPENDS="libsvgtiny libdom-dev" 13.49 - ;; 13.50 - esac 13.51 - TAGS="netsurf" 13.52 -}
14.1 --- a/libutf8proc/receipt Thu Oct 04 16:01:47 2018 +0300 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,39 +0,0 @@ 14.4 -# SliTaz package receipt v2. 14.5 - 14.6 -PACKAGE="libutf8proc" 14.7 -COMMIT="770e329cceaf0620c7b482589a9b17ed1d19c16d" 14.8 -VERSION="1.3.1-2-161123" 14.9 -CATEGORY="libs" 14.10 -SHORT_DESC="C library for processing UTF-8 encoded Unicode strings" 14.11 -MAINTAINER="al.bobylev@gmail.com" 14.12 -LICENSE="MIT" 14.13 -WEB_SITE="http://git.netsurf-browser.org/libutf8proc.git/" 14.14 - 14.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 14.16 -BASE_URL="http://git.netsurf-browser.org/$PACKAGE.git/snapshot" 14.17 -if [ -n "$COMMIT" ]; then 14.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 14.19 -else 14.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 14.21 -fi 14.22 - 14.23 -BUILD_DEPENDS="netsurf-buildsystem" 14.24 -SPLIT="libutf8proc-dev" 14.25 - 14.26 -compile_rules() { 14.27 - [ -z "$COMMIT" ] && cd $VERSION 14.28 - 14.29 - make \ 14.30 - PREFIX=/usr \ 14.31 - LIBDIR=lib \ 14.32 - INCLUDEDIR=include \ 14.33 - COMPONENT_TYPE=lib-shared \ 14.34 - install 14.35 -} 14.36 - 14.37 -genpkg_rules() { 14.38 - case $PACKAGE in 14.39 - libutf8proc) copy @std;; 14.40 - *-dev) copy @dev;; 14.41 - esac 14.42 -}
15.1 --- a/libwapcaplet/receipt Thu Oct 04 16:01:47 2018 +0300 15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 15.3 @@ -1,42 +0,0 @@ 15.4 -# SliTaz package receipt v2. 15.5 - 15.6 -PACKAGE="libwapcaplet" 15.7 -COMMIT="" 15.8 -VERSION="0.4.1" 15.9 -CATEGORY="system-tools" 15.10 -SHORT_DESC="String internment library with rapid string comparison" 15.11 -MAINTAINER="erjo@slitaz.org" 15.12 -LICENSE="MIT" 15.13 -WEB_SITE="http://www.netsurf-browser.org/projects/libwapcaplet/" 15.14 - 15.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 15.16 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 15.17 -if [ -n "$COMMIT" ]; then 15.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 15.19 -else 15.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 15.21 -fi 15.22 - 15.23 -BUILD_DEPENDS="netsurf-buildsystem" 15.24 -SPLIT="libwapcaplet-dev" 15.25 - 15.26 -compile_rules() { 15.27 - [ -z "$COMMIT" ] && cd $VERSION 15.28 - 15.29 - sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile 15.30 - 15.31 - make \ 15.32 - PREFIX=/usr \ 15.33 - LIBDIR=lib \ 15.34 - INCLUDEDIR=include \ 15.35 - COMPONENT_TYPE=lib-shared \ 15.36 - install 15.37 -} 15.38 - 15.39 -genpkg_rules() { 15.40 - case $PACKAGE in 15.41 - libwapcaplet) copy @std;; 15.42 - *-dev) copy @dev;; 15.43 - esac 15.44 - TAGS="netsurf" 15.45 -}
16.1 --- a/netsurf-buildsystem/receipt Thu Oct 04 16:01:47 2018 +0300 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,34 +0,0 @@ 16.4 -# SliTaz package receipt v2. 16.5 - 16.6 -PACKAGE="netsurf-buildsystem" 16.7 -COMMIT="" 16.8 -VERSION="1.6" 16.9 -CATEGORY="development" 16.10 -SHORT_DESC="The Netsurf buildsystem" 16.11 -MAINTAINER="al.bobylev@gmail.com" 16.12 -LICENSE="MIT" 16.13 -WEB_SITE="http://source.netsurf-browser.org/buildsystem.git/" 16.14 - 16.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 16.16 -BASE_URL="http://source.netsurf-browser.org/buildsystem.git/snapshot" 16.17 -if [ -n "$COMMIT" ]; then 16.18 - WGET_URL="$BASE_URL/buildsystem-$COMMIT.tar.bz2" 16.19 -else 16.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 16.21 -fi 16.22 - 16.23 -compile_rules() { 16.24 - [ -z "$COMMIT" ] && cd $VERSION 16.25 - 16.26 - sed -i 's|-Werror||' Makefile 16.27 - 16.28 - make \ 16.29 - PREFIX=/usr \ 16.30 - install 16.31 -} 16.32 - 16.33 -genpkg_rules() { 16.34 - copy @std @dev 16.35 - DEPENDS="perl" 16.36 - TAGS="netsurf" 16.37 -}
17.1 Binary file netsurf/.icon.png has changed
18.1 --- a/netsurf/receipt Thu Oct 04 16:01:47 2018 +0300 18.2 +++ b/netsurf/receipt Thu Oct 04 19:53:01 2018 +0300 18.3 @@ -1,73 +1,62 @@ 18.4 # SliTaz package receipt v2. 18.5 18.6 PACKAGE="netsurf" 18.7 -COMMIT="" 18.8 -VERSION="3.7" 18.9 +VERSION="3.8" 18.10 CATEGORY="network" 18.11 SHORT_DESC="Lightweight and fast web browser" 18.12 MAINTAINER="al.bobylev@gmail.com" 18.13 LICENSE="GPL2" 18.14 WEB_SITE="http://www.netsurf-browser.org/" 18.15 18.16 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 18.17 -BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot" 18.18 -if [ -n "$COMMIT" ]; then 18.19 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 18.20 -else 18.21 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 18.22 -fi 18.23 +TARBALL="$PACKAGE-all-$VERSION.tar.gz" 18.24 +WGET_URL="http://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL" 18.25 18.26 -BUILD_DEPENDS="libjpeg-turbo-dev libharu-dev duktape-dev libcss-dev libdom-dev \ 18.27 -libnsutils-dev libutf8proc-dev curl-dev openssl-dev libpng16-dev libnsbmp-dev \ 18.28 -libnsgif-dev libsvgtiny-dev libnspsl-dev libnslog-dev gstreamer0-dev gtk+-dev \ 18.29 -check-dev perl-html-parser nsgenbind" # librsvg-dev 18.30 +BUILD_DEPENDS="bison flex perl expat-dev gperf libjpeg-turbo-dev curl-dev \ 18.31 +openssl-dev libpng16-dev librsvg-dev gtk+-dev check-dev perl-html-parser" 18.32 +# libharu-dev gstreamer0-dev 18.33 18.34 compile_rules() { 18.35 - [ -z "$COMMIT" ] && cd $VERSION 18.36 + cat > netsurf/Makefile.config <<EOT 18.37 +# Enable NetSurf's use of gstreamer for displaying videos. 18.38 +# Currently disabled: not maintained and produce build errors. 18.39 +# override NETSURF_USE_VIDEO := YES 18.40 18.41 - # Enable NetSurf's use of gstreamer for displaying videos 18.42 -# echo 'override NETSURF_USE_VIDEO := YES' > Makefile.config 18.43 - # Enable NetSurf's use of libharu for PDF export and GTK printing support. 18.44 -# echo 'override NETSURF_USE_HARU_PDF := YES' >> Makefile.config 18.45 - # Template used for constructing the User Agent: string. 18.46 - # 1,2: major & minor version numbers; 3 `uname -s`; 4 `uname -m` 18.47 - echo 'override NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (SliTaz GNU/%s %s)"' >> Makefile.config 18.48 - # Default home page, if one is not defined by the user. 18.49 - echo 'override NETSURF_HOMEPAGE := "file:///usr/share/webhome/index.html"' >> Makefile.config 18.50 +# Enable NetSurf's use of libharu for PDF export and GTK printing support. 18.51 +# Currently disabled: not maintained and produce build errors. 18.52 +# override NETSURF_USE_HARU_PDF := YES 18.53 18.54 +# Default home page, if one is not defined by the user. 18.55 +override NETSURF_HOMEPAGE := "file:///usr/share/webhome/index.html" 18.56 +EOT 18.57 18.58 - # fix installing 18.59 - sed -i '/install \$(EXETARGET)/ s|^|#|' frontends/gtk/Makefile 18.60 + sed -i 's|-Werror||' libsvgtiny/Makefile 18.61 18.62 make \ 18.63 PREFIX=/usr \ 18.64 - LIBDIR=lib \ 18.65 - INCLUDEDIR=include \ 18.66 TARGET=gtk \ 18.67 - NETSURF_GTK_MAJOR=2 \ 18.68 install || return 1 18.69 - # FIXME: it is job for `make` 18.70 - cp -af nsgtk $install/usr/bin/netsurf-gtk 18.71 18.72 # desktop shortcut 18.73 - mkdir -p $install/usr/share/applications 18.74 - sed 's|netsurf.png|netsurf|' \ 18.75 - < frontends/gtk/res/netsurf-gtk.desktop \ 18.76 - > $install/usr/share/applications/netsurf-gtk.desktop 18.77 + mkdir -p $install/usr/share/applications/ 18.78 + sed 's|netsurf.png|netsurf|; s|netsurf-gtk|netsurf|' \ 18.79 + < netsurf/frontends/gtk/res/netsurf-gtk.desktop \ 18.80 + > $install/usr/share/applications/netsurf.desktop 18.81 + 18.82 # desktop icons 18.83 - mkdir -p $install/usr/share/icons 18.84 - cp -r $stuff/hicolor $install/usr/share/icons 18.85 + mkdir -p $install/usr/share/icons/ 18.86 + cp -r $stuff/hicolor/ $install/usr/share/icons/ 18.87 18.88 - chown -R root:root $install 18.89 + # wrapper 18.90 + install -Dm755 $stuff/netsurf $install/usr/bin/netsurf 18.91 + 18.92 + chown -R root:root $install # fix 107:nogroop somewhere 18.93 } 18.94 18.95 genpkg_rules() { 18.96 copy @std 18.97 # Remove files to save some space 18.98 rm -rf $fs/usr/share/netsurf/*.xpm 18.99 - DEPENDS="atk cairo expat fontconfig freetype gdk-pixbuf glib gstreamer0 \ 18.100 - gtk+ openssl libcss libcurl libdom libhubbub libjpeg-turbo libnsbmp \ 18.101 - libnsgif libnslog libnspsl libnsutils libparserutils libpng16 \ 18.102 - libsvgtiny libutf8proc libwapcaplet libxml2 pango zlib" 18.103 - TAGS="web-browser netsurf" 18.104 + DEPENDS="cairo expat gdk-pixbuf glib gtk+ libcurl libjpeg-turbo libpng16 \ 18.105 + librsvg openssl pango zlib" 18.106 + TAGS="web-browser" 18.107 }
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/netsurf/stuff/netsurf Thu Oct 04 19:53:01 2018 +0300 19.3 @@ -0,0 +1,4 @@ 19.4 +#!/bin/sh 19.5 +[ -d "/usr/share/netsurf/${LANG:0:2}" ] && exec netsurf-gtk "$@" 19.6 + 19.7 +LANG=en_US.UTF-8 exec netsurf-gtk "$@"
20.1 --- a/netsurf/stuff/oldstuff/Makefile.config Thu Oct 04 16:01:47 2018 +0300 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,9 +0,0 @@ 20.4 -# 20.5 -# NetSurf default build configuration fro SliTaz 20.6 -# 20.7 - 20.8 -NETSURF_USE_BMP := NO 20.9 -NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (%s; %s) SliTaz" 20.10 -NETSURF_HOMEPAGE := "file:///usr/share/webhome/netsurf.html" 20.11 -PREFIX := /usr 20.12 -
21.1 --- a/netsurf/stuff/oldstuff/Makefile.defaults Thu Oct 04 16:01:47 2018 +0300 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,230 +0,0 @@ 21.4 -# 21.5 -# NetSurf default build configuration 21.6 -# 21.7 -# Some of these options support an 'AUTO' option, as well as YES and NO. 21.8 -# When an option is set to AUTO, the Makefile will attempt to detect if that 21.9 -# feature is available, enabling it if possible. 21.10 -# 21.11 -# Options marked "highly recommended" have a severe impact on NetSurf's 21.12 -# use as a web browser and should be set to YES unless there is a particularly 21.13 -# good reason not to. 21.14 -# 21.15 -# This file should be treated as INVIOLATE and only altered to alter 21.16 -# the defaults by a core developer. If you wish to configure the build 21.17 -# of NetSurf then instead please create a file called Makefile.config 21.18 -# and simply override the statements you require in that. Remember 21.19 -# that Makefile.config cannot override the TARGET. That must be set on 21.20 -# the commandline. i.e. 'make TARGET=framebuffer' However 21.21 -# Makefile.config can use the TARGET variable to control what to set 21.22 -# the configuration options to. 21.23 -# 21.24 - 21.25 -# ---------------------------------------------------------------------------- 21.26 -# Options relating to all versions of NetSurf 21.27 -# ---------------------------------------------------------------------------- 21.28 - 21.29 -# Enable NetSurf's use of libnsbmp for displaying BMPs and ICOs 21.30 -# Valid options: YES, NO 21.31 -NETSURF_USE_BMP := NO 21.32 - 21.33 -# Enable NetSurf's use of libnsgif for displaying GIFs 21.34 -# Valid options: YES, NO (highly recommended) 21.35 -NETSURF_USE_GIF := YES 21.36 - 21.37 -# Enable NetSurf's use of libjpeg for displaying JPEGs 21.38 -# Valid options: YES, NO (highly recommended) 21.39 -NETSURF_USE_JPEG := YES 21.40 - 21.41 -# Enable NetSurf's use of libpng for displaying PNGs. If MNG and PNG 21.42 -# are both enabled then NetSurf will choose libpng for PNGs, leaving 21.43 -# MNGs and JNGs to libmng. 21.44 -# Valid options: YES, NO (at least one of PNG/MNG highly recommended) 21.45 -NETSURF_USE_PNG := YES 21.46 - 21.47 -# Enable NetSurf's use of libmng for displaying MNGs, JNGs and PNGs 21.48 -# Valid options: YES, NO (at least one of PNG/MNG highly recommended) 21.49 -NETSURF_USE_MNG := NO 21.50 - 21.51 -# Enable NetSurf's use of libharu for PDF export and GTK printing support. 21.52 -# There is no auto-detection available for this, as it does not have a 21.53 -# pkg-config file. 21.54 -# Valid options: YES, NO 21.55 -NETSURF_USE_HARU_PDF := NO 21.56 - 21.57 -# Enable stripping the NetSurf binary 21.58 -# Valid options: YES, NO 21.59 -NETSURF_STRIP_BINARY := YES 21.60 - 21.61 -# Template used for constructing the User Agent: string. The first two 21.62 -# replacements are major/minor version, second two are OS and architecture. 21.63 -# Please don't be tempted to mention Mozilla here! Let's let that lie die. 21.64 -NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (%s; %s) SliTaz" 21.65 - 21.66 -# Default home page, if one is not defined by the user. Note that this 21.67 -# option does not apply to the RISC OS version, as it has its own local 21.68 -# home page, and it can be changed by editing the end of gui_init2() in 21.69 -# riscos/gui.c 21.70 -NETSURF_HOMEPAGE := "file:///usr/share/webhome/netsurf.html" 21.71 - 21.72 -# Force using glibc internal iconv implementation instead of external libiconv 21.73 -# Valid options: YES, NO 21.74 -NETSURF_USE_LIBICONV_PLUG := YES 21.75 - 21.76 -# Initial CFLAGS. Optimisation level etc. tend to be target specific. 21.77 -CFLAGS := 21.78 - 21.79 -# Default installation/execution prefix 21.80 -PREFIX := /usr 21.81 - 21.82 -# ---------------------------------------------------------------------------- 21.83 -# RISC OS-specific options 21.84 -# ---------------------------------------------------------------------------- 21.85 -ifeq ($(TARGET),riscos) 21.86 - 21.87 - # Enable NetSurf's use of libsvgtiny for displaying SVGs 21.88 - # Valid options: YES, NO 21.89 - NETSURF_USE_NSSVG := YES 21.90 - 21.91 - # Enable NetSurf's use of pencil for Drawfile export 21.92 - # Valid options: YES, NO 21.93 - NETSURF_USE_DRAW := YES 21.94 - 21.95 - # Enable NetSurf's support for displaying RISC OS Sprites 21.96 - # Valid options: YES, NO 21.97 - NETSURF_USE_SPRITE := YES 21.98 - 21.99 - # Enable NetSurf's use of AWRender for displaying ArtWorks files 21.100 - # Valid options: YES, NO 21.101 - NETSURF_USE_ARTWORKS := YES 21.102 - 21.103 - # Enable NetSurf's support for the Acorn plugin protocol 21.104 - # Valid options: YES, NO 21.105 - NETSURF_USE_PLUGINS := NO 21.106 - 21.107 - # Optimisation levels 21.108 - CFLAGS += -O2 -Wuninitialized 21.109 - 21.110 -endif 21.111 - 21.112 -# ---------------------------------------------------------------------------- 21.113 -# GTK-specific options 21.114 -# ---------------------------------------------------------------------------- 21.115 -ifeq ($(TARGET),gtk) 21.116 - 21.117 - # Where to search for NetSurf's resources after looking in ~/.netsurf and 21.118 - # $NETSURFRES. It must have a trailing / 21.119 - NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/ 21.120 - 21.121 - # Where to install the netsurf binary 21.122 - NETSURF_GTK_BIN := $(PREFIX)/bin/ 21.123 - 21.124 - # Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs 21.125 - # Valid options: YES, NO, AUTO 21.126 - NETSURF_USE_RSVG := AUTO 21.127 - 21.128 - # Enable NetSurf's use of librosprite for displaying RISC OS Sprites 21.129 - # Valid options: YES, NO, AUTO 21.130 - NETSURF_USE_ROSPRITE := AUTO 21.131 - 21.132 - # Configuration overrides for Mac OS X 21.133 - ifeq ($(HOST),macosx) 21.134 - NETSURF_USE_LIBICONV_PLUG := NO 21.135 - NETSURF_USE_HARU_PDF := NO 21.136 - endif 21.137 - 21.138 - # Optimisation levels 21.139 - CFLAGS += -O2 -Wuninitialized 21.140 - 21.141 -endif 21.142 - 21.143 -# ---------------------------------------------------------------------------- 21.144 -# BeOS-specific options 21.145 -# ---------------------------------------------------------------------------- 21.146 -ifeq ($(TARGET),beos) 21.147 - 21.148 - 21.149 - # Where to install the netsurf binary 21.150 - NETSURF_BEOS_BIN := /boot/apps/netsurf/ 21.151 - 21.152 - # TODO:HAIKU -- not sure if ~/.netsurf applies in beos 21.153 - # Where to search for NetSurf's resources after looking in ~/.netsurf and 21.154 - # $NETSURFRES. It must have a trailing / 21.155 - NETSURF_BEOS_RESOURCES := /boot/apps/netsurf/res/ 21.156 - 21.157 - # Enable NetSurf's use of librosprite for displaying RISC OS Sprites 21.158 - # Valid options: YES, NO, AUTO 21.159 - NETSURF_USE_ROSPRITE := AUTO 21.160 - 21.161 - # Enable NetSurf's use of libharu for PDF export. 21.162 - # Valid options: YES, NO 21.163 - NETSURF_USE_HARU_PDF := NO 21.164 - 21.165 - # Force using glibc internal iconv implementation instead of external libiconv 21.166 - # Valid options: YES, NO 21.167 - NETSURF_USE_LIBICONV_PLUG := NO 21.168 - 21.169 - # Optimisation levels 21.170 - CFLAGS += -O2 -Wuninitialized 21.171 - 21.172 -endif 21.173 - 21.174 -# ---------------------------------------------------------------------------- 21.175 -# Amiga-specific options 21.176 -# ---------------------------------------------------------------------------- 21.177 -ifeq ($(TARGET),amiga) 21.178 - 21.179 - # Enable NetSurf's use of librosprite for displaying RISC OS Sprites 21.180 - # Valid options: YES, NO, AUTO 21.181 - NETSURF_USE_ROSPRITE := YES 21.182 - 21.183 - # Enable NetSurf's use of libsvgtiny for displaying SVGs 21.184 - # (NB: Requires NETSURF_AMIGA_USE_CAIRO) 21.185 - # Valid options: YES, NO 21.186 - NETSURF_USE_NSSVG := NO 21.187 - 21.188 - # Enable NetSurf's use of libcairo for some plotter functions 21.189 - # This will also link NetSurf with shared objects, and 21.190 - # requires AmigaOS 4.1 or higher to run the resulting executable 21.191 - # Valid options: YES, NO 21.192 - NETSURF_AMIGA_USE_CAIRO := NO 21.193 - 21.194 - # Optimisation levels 21.195 - CFLAGS += -O2 -Wuninitialized 21.196 - 21.197 -endif 21.198 - 21.199 -# ---------------------------------------------------------------------------- 21.200 -# Framebuffer-target-specific options 21.201 -# ---------------------------------------------------------------------------- 21.202 -ifeq ($(TARGET),framebuffer) 21.203 - # Optimisation levels 21.204 - CFLAGS += -O2 -Wuninitialized 21.205 - 21.206 - # Framebuffer frontend. 21.207 - # Valid values are: linux, sdl, vnc, able 21.208 - NETSURF_FB_FRONTEND := linux 21.209 - 21.210 - # Use libharu to enable PDF export and GTK printing support. 21.211 - # Valid options: YES, NO 21.212 - NETSURF_USE_HARU_PDF := NO 21.213 - 21.214 - # Library to use for font plotting 21.215 - # Valid options: internal, freetype 21.216 - NETSURF_FB_FONTLIB := internal 21.217 - 21.218 - # Framebuffer frontends may have differing root paths for resources 21.219 - # As such, these specify the resource path and config path. 21.220 - NETSURF_FB_RESPATH_linux := $(PREFIX)/share/netsurf/ 21.221 - NETSURF_FB_RESPATH_able := (tftpboot)/ 21.222 - NETSURF_FB_RESPATH_dummy := ./ 21.223 - NETSURF_FB_RESPATH_sdl := $(PREFIX)/share/netsurf/ 21.224 - NETSURF_FB_RESPATH_vnc := $(PREFIX)/share/netsurf/ 21.225 - 21.226 - NETSURF_FRAMEBUFFER_RESOURCES = $(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND)) 21.227 - NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/ 21.228 - 21.229 -endif 21.230 - 21.231 -# Include any local configuration 21.232 --include Makefile.config 21.233 -
22.1 --- a/netsurf/stuff/oldstuff/netsurf.desktop Thu Oct 04 16:01:47 2018 +0300 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,11 +0,0 @@ 22.4 -[Desktop Entry] 22.5 -Name=NetSurf Web Browser 22.6 -Name[de]=Netznavigator NetSurf 22.7 -Name[fr]=Navigateur Web NetSurf 22.8 -Name[pt]=Navegador Web NetSurf 22.9 -Name[pt_BR]=Navegador Web NetSurf 22.10 -Type=Application 22.11 -Categories=Network; 22.12 -MimeType=text/html;application/xhtml+xml; 22.13 -Exec=netsurf %u 22.14 -Icon=netsurf
23.1 Binary file netsurf/stuff/oldstuff/netsurf.png has changed
24.1 --- a/netsurf/stuff/oldstuff/webhome/netsurf.html Thu Oct 04 16:01:47 2018 +0300 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,76 +0,0 @@ 24.4 -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 24.5 - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 24.6 -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 24.7 -<head> 24.8 - <title>SliTaz - Web Homepage</title> 24.9 - <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> 24.10 - <meta name="author" content="Christophe Lincoln"/> 24.11 - <link rel="shortcut icon" href="favicon.ico" /> 24.12 - <link rel="stylesheet" type="text/css" href="style.css" /> 24.13 -</head> 24.14 -<body> 24.15 - 24.16 -<!-- Header --> 24.17 -<div id="header"> 24.18 - <div id="logo"></div> 24.19 - <div id="network"> 24.20 - <a href="http://www.slitaz.org/">Website</a> 24.21 - <a href="http://scn.slitaz.org/">Community</a> 24.22 - <a href="http://doc.slitaz.org/">Doc</a> 24.23 - <a href="http://forum.slitaz.org/">Forum</a> 24.24 - <a href="http://labs.slitaz.org/issues">Bugs</a> 24.25 - <a href="http://hg.slitaz.org/">Hg</a> 24.26 - </div> 24.27 - <h1>SliTaz Web Home</h1> 24.28 -</div> 24.29 - 24.30 -<div id="block"></div> 24.31 - 24.32 -<!-- Content --> 24.33 -<div id="content"> 24.34 - 24.35 -<!-- Custom style for netsurf --> 24.36 -<style type="text/css"> 24.37 -#search { text-align: center; margin: 40px 0px; } 24.38 -input[type=submit] { 24.39 - border: 1px solid #b64b22; 24.40 - background-color: #b64b22; 24.41 - color: white; 24.42 - font-weight: bold; 24.43 - cursor: pointer; 24.44 - padding: 3px 10px; 24.45 - font-size: 15px; 24.46 - margin-left: -5px; 24.47 -} 24.48 -input[type=text] { 24.49 - border: 1px solid #333333; 24.50 - padding: 4px; 24.51 - height: 15px; 24.52 - width: 68%; 24.53 -} 24.54 -</style> 24.55 - 24.56 -<div id="search"> 24.57 - <form method="get" action="http://www.google.com/search"> 24.58 - <p> 24.59 - <input type="text" name="q" size="55" maxlength="255" /> 24.60 - <input type="submit" value="Google" style="height: 25px;" /> 24.61 - </p> 24.62 - </form> 24.63 -</div> 24.64 - 24.65 -<!-- SliTaz Social --> 24.66 -<div id="social"> 24.67 - SliTaz @ 24.68 - <a href="http://twitter.com/slitaz">Twitter</a> 24.69 - <a href="http://www.facebook.com/slitaz">Facebook</a> 24.70 - <a href="http://distrowatch.com/slitaz">Distrowatch</a> 24.71 - <a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a> 24.72 - <a href="http://flattr.com/profile/slitaz">Flattr</a> 24.73 -</div> 24.74 - 24.75 -<!-- End of content with round corner --> 24.76 -</div> 24.77 - 24.78 -</body> 24.79 -</html>
25.1 --- a/netsurf/stuff/oldstuff/webhome/style.css Thu Oct 04 16:01:47 2018 +0300 25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 25.3 @@ -1,80 +0,0 @@ 25.4 -/* CSS style for SliTaz GNU/Linux generic xHTML files. */ 25.5 - 25.6 -html { min-height: 102%; } 25.7 - 25.8 -body { 25.9 - background: #ffffff; 25.10 - color: black; 25.11 - font: 13px sans-serif, vernada, arial; 25.12 - margin: 0; 25.13 - min-width: 640px; 25.14 -} 25.15 - 25.16 -a { text-decoration: underline; color: #215090; } 25.17 -a:hover { text-decoration: none; color: blue; } 25.18 -img { border: 0pt none; vertical-align: middle; } 25.19 -h2 { color: #444; } 25.20 -h3 { color: #666; font-size: 140%; } 25.21 - 25.22 -#header { 25.23 - height: 40px; 25.24 - background: #351a0a; 25.25 -} 25.26 - 25.27 -#header h1 { 25.28 - margin: 0; 25.29 - padding: 8px 0 0 8px; 25.30 - width: 250px; 25.31 - color: white; 25.32 - font-size: 20px; 25.33 - font-style: italic; 25.34 -} 25.35 - 25.36 -#header h1 a { 25.37 - color: white; 25.38 - text-decoration: none; 25.39 - font-size: 20px; 25.40 - font-style: italic; 25.41 -} 25.42 - 25.43 -#header h1 a:hover, #network a:hover { 25.44 - color: #d66018; 25.45 -} 25.46 - 25.47 -#network { 25.48 - float: right; 25.49 - padding: 12px 5px 0; 25.50 - font-size: 12px; 25.51 -} 25.52 - 25.53 -#network a { padding: 0 6px; } 25.54 - 25.55 -#network a { 25.56 - color: #fff; 25.57 - font-weight: bold; 25.58 - text-decoration: none; 25.59 -} 25.60 - 25.61 -#block { 25.62 - height: 8px; 25.63 - background: #d66018; 25.64 - padding: 0; 25.65 - border-bottom: 1px solid #f5f5f5; 25.66 -} 25.67 - 25.68 -#content { 25.69 - padding: 30px 80px; 25.70 - text-align: justify; 25.71 -} 25.72 - 25.73 -#social { text-align: center; color: #666; } 25.74 -#social a { color: #666; padding: 0 2px; } 25.75 - 25.76 -#footer { 25.77 - text-align: center; 25.78 - border-top: 1px solid #ddd; 25.79 - padding: 40px; 25.80 - color: #666; 25.81 -} 25.82 - 25.83 -#footer a { color: #666; padding: 0 2px; }
26.1 --- a/netsurf/stuff/patches/headers.patch Thu Oct 04 16:01:47 2018 +0300 26.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 26.3 @@ -1,42 +0,0 @@ 26.4 -desktop/font.h -> desktop/gui_layout.h 26.5 -http://git.netsurf-browser.org/netsurf.git/commit/?id=974a4a21e16a2da85a66aae9b80eeca15ca26dd6 26.6 - 26.7 -desktop/gui_layout.h -> include/netsurf/layout.h 26.8 -http://git.netsurf-browser.org/netsurf.git/commit/?id=9ce71876ce500e242e2384c21abb38a8f431138b 26.9 - 26.10 -desktop/gui_misc.h -> include/netsurf/misc.h 26.11 -http://git.netsurf-browser.org/netsurf.git/commit/?id=fe7eb85614244d5e0659c88431fbd9726fa33051 26.12 - 26.13 ---- a/desktop/font_haru.c 26.14 -+++ b/desktop/font_haru.c 26.15 -@@ -38,7 +38,7 @@ 26.16 - 26.17 - #include "utils/nsoption.h" 26.18 - #include "desktop/font_haru.h" 26.19 --#include "desktop/font.h" 26.20 -+#include "netsurf/layout.h" 26.21 - #include "utils/log.h" 26.22 - 26.23 - 26.24 ---- a/desktop/font_haru.h 26.25 -+++ b/desktop/font_haru.h 26.26 -@@ -27,7 +27,7 @@ 26.27 - #include <hpdf.h> 26.28 - 26.29 - #include "desktop/plot_style.h" 26.30 --#include "desktop/font.h" 26.31 -+#include "netsurf/layout.h" 26.32 - 26.33 - bool haru_nsfont_apply_style(const plot_font_style_t *fstyle, 26.34 - HPDF_Doc doc, HPDF_Page page, 26.35 ---- a/desktop/save_pdf.c 26.36 -+++ b/desktop/save_pdf.c 26.37 -@@ -60,7 +60,7 @@ 26.38 - #include "utils/useragent.h" 26.39 - #include "content/hlcache.h" 26.40 - #include "utils/nsoption.h" 26.41 --#include "desktop/gui_misc.h" 26.42 -+#include "netsurf/misc.h" 26.43 - #include "desktop/gui_internal.h" 26.44 - #include "netsurf/bitmap.h" 26.45 -
27.1 --- a/netsurf/stuff/patches/netsurf-3.6-CFLAGS.patch Thu Oct 04 16:01:47 2018 +0300 27.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 27.3 @@ -1,67 +0,0 @@ 27.4 ---- a/Makefile.defaults 27.5 -+++ b/Makefile.defaults 27.6 -@@ -96,12 +96,6 @@ 27.7 - # Valid options: YES, NO 27.8 - NETSURF_FS_BACKING_STORE := NO 27.9 - 27.10 --# Initial CFLAGS. Optimisation level etc. tend to be target specific. 27.11 --CFLAGS := 27.12 -- 27.13 --# Initial CXXFLAGS. Optimisation level etc. tend to be target specific. 27.14 --CXXFLAGS := 27.15 -- 27.16 - # Default installation/execution prefix 27.17 - PREFIX ?= /usr/local 27.18 - 27.19 ---- a/frontends/framebuffer/Makefile 27.20 -+++ b/frontends/framebuffer/Makefile 27.21 -@@ -20,7 +20,7 @@ 27.22 - CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"' 27.23 - CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"' 27.24 - 27.25 --CFLAGS += -std=c99 -g -Dsmall \ 27.26 -+CFLAGS += -std=c99 -Dsmall \ 27.27 - -D_BSD_SOURCE \ 27.28 - -D_DEFAULT_SOURCE \ 27.29 - -D_XOPEN_SOURCE=600 \ 27.30 ---- a/frontends/framebuffer/Makefile.defaults 27.31 -+++ b/frontends/framebuffer/Makefile.defaults 27.32 -@@ -3,7 +3,7 @@ 27.33 - # ---------------------------------------------------------------------------- 27.34 - 27.35 - # Optimisation levels 27.36 --CFLAGS += -O2 27.37 -+CFLAGS += 27.38 - 27.39 - # Framebuffer default surface provider. 27.40 - # Valid values are: x, sdl, linux, vnc, able, 27.41 ---- a/frontends/gtk/Makefile 27.42 -+++ b/frontends/gtk/Makefile 27.43 -@@ -33,7 +33,7 @@ 27.44 - endif 27.45 - 27.46 - 27.47 --GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \ 27.48 -+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ 27.49 - $(GTKDEPFLAGS) \ 27.50 - -D_BSD_SOURCE \ 27.51 - -D_DEFAULT_SOURCE \ 27.52 ---- a/frontends/gtk/Makefile.defaults 27.53 -+++ b/frontends/gtk/Makefile.defaults 27.54 -@@ -39,4 +39,4 @@ 27.55 - NETSURF_GTK_MAJOR ?= 2 27.56 - 27.57 - # Optimisation levels 27.58 --CFLAGS += -O2 27.59 -+CFLAGS += 27.60 ---- a/test/Makefile 27.61 -+++ b/test/Makefile 27.62 -@@ -105,7 +105,7 @@ 27.63 - COMMON_WARNFLAGS += -Wno-unused-parameter 27.64 - endif 27.65 - 27.66 --TESTCFLAGS := -std=c99 -g \ 27.67 -+TESTCFLAGS := -std=c99 \ 27.68 - $(COMMON_WARNFLAGS) \ 27.69 - -D_BSD_SOURCE \ 27.70 - -D_POSIX_C_SOURCE=200809L \
28.1 --- a/netsurf/stuff/patches/netsurf-3.6-conditionally-include-image-headers.patch Thu Oct 04 16:01:47 2018 +0300 28.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 28.3 @@ -1,31 +0,0 @@ 28.4 ---- a/content/handlers/image/image.c 28.5 -+++ b/content/handlers/image/image.c 28.6 -@@ -27,14 +27,28 @@ 28.7 - #include "netsurf/content.h" 28.8 - #include "desktop/gui_internal.h" 28.9 - 28.10 -+#ifdef WITH_BMP 28.11 - #include "image/bmp.h" 28.12 -+#endif 28.13 -+#ifdef WITH_GIF 28.14 - #include "image/gif.h" 28.15 -+#endif 28.16 - #include "image/ico.h" 28.17 -+#ifdef WITH_JPEG 28.18 - #include "image/jpeg.h" 28.19 -+#endif 28.20 -+#ifdef WITH_NSSPRITE 28.21 - #include "image/nssprite.h" 28.22 -+#endif 28.23 -+#ifdef WITH_PNG 28.24 - #include "image/png.h" 28.25 -+#endif 28.26 -+#ifdef WITH_RSVG 28.27 - #include "image/rsvg.h" 28.28 -+#endif 28.29 -+#ifdef WITH_NS_SVG 28.30 - #include "image/svg.h" 28.31 -+#endif 28.32 - #include "image/image.h" 28.33 - 28.34 - /**
29.1 --- a/netsurf/stuff/patches/netsurf-3.6-gstreamer.patch Thu Oct 04 16:01:47 2018 +0300 29.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 29.3 @@ -1,31 +0,0 @@ 29.4 ---- a/frontends/gtk/Makefile 29.5 -+++ b/frontends/gtk/Makefile 29.6 -@@ -16,7 +16,6 @@ 29.7 - 29.8 - # GTK and GLIB flags to disable depricated usage 29.9 - GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \ 29.10 -- -DG_DISABLE_DEPRECATED \ 29.11 - -DGTK_DISABLE_SINGLE_INCLUDES \ 29.12 - -DGTK_MULTIHEAD_SAFE \ 29.13 - -DPANGO_DISABLE_DEPRECATED 29.14 ---- a/content/handlers/image/video.c 29.15 -+++ b/content/handlers/image/video.c 29.16 -@@ -22,6 +22,8 @@ 29.17 - #include "content/content_protected.h" 29.18 - 29.19 - #include "image/video.h" 29.20 -+#include "utils/http/parameter.h" 29.21 -+#include "content/llcache.h" 29.22 - 29.23 - typedef struct nsvideo_content { 29.24 - struct content base; 29.25 ---- a/content/content_factory.h 29.26 -+++ b/content/content_factory.h 29.27 -@@ -25,6 +25,7 @@ 29.28 - 29.29 - #include "netsurf/content_type.h" 29.30 - #include "utils/errors.h" 29.31 -+#include "utils/utils.h" 29.32 - 29.33 - #define CONTENT_FACTORY_REGISTER_TYPES(HNAME, HTYPELIST, HHANDLER) \ 29.34 - \
30.1 --- a/netsurf/stuff/patches/netsurf-3.6-pdf-writer.patch Thu Oct 04 16:01:47 2018 +0300 30.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 30.3 @@ -1,80 +0,0 @@ 30.4 ---- a/desktop/font_haru.c 30.5 -+++ b/desktop/font_haru.c 30.6 -@@ -37,7 +37,7 @@ 30.7 - #include <hpdf.h> 30.8 - 30.9 - #include "utils/nsoption.h" 30.10 --#include "desktop/save_pdf/font_haru.h" 30.11 -+#include "desktop/font_haru.h" 30.12 - #include "desktop/font.h" 30.13 - #include "utils/log.h" 30.14 - 30.15 ---- a/desktop/save_pdf.c 30.16 -+++ b/desktop/save_pdf.c 30.17 -@@ -60,6 +60,8 @@ 30.18 - #include "utils/useragent.h" 30.19 - #include "content/hlcache.h" 30.20 - #include "utils/nsoption.h" 30.21 -+#include "desktop/gui_misc.h" 30.22 -+#include "desktop/gui_internal.h" 30.23 - #include "netsurf/bitmap.h" 30.24 - 30.25 - #include "netsurf/plotters.h" 30.26 -@@ -450,11 +452,6 @@ 30.27 - 30.28 - switch(content_get_type(content)){ 30.29 - /*Handle "embeddable" types of images*/ 30.30 -- case CONTENT_JPEG: 30.31 -- image = HPDF_LoadJpegImageFromMem(pdf_doc, 30.32 -- (const HPDF_BYTE *) source_data, 30.33 -- source_size); 30.34 -- break; 30.35 - 30.36 - /*Disabled until HARU PNG support will be more stable. 30.37 - 30.38 -@@ -700,7 +697,7 @@ 30.39 - 30.40 - 30.41 - #ifndef PDF_DEBUG 30.42 -- if (option_enable_PDF_compression) 30.43 -+ if (nsoption_bool(enable_PDF_compression)) 30.44 - HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/ 30.45 - #endif 30.46 - HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string()); 30.47 -@@ -774,7 +771,7 @@ 30.48 - assert(settings->output != NULL); 30.49 - 30.50 - /*Encryption on*/ 30.51 -- if (option_enable_PDF_password) 30.52 -+ if (nsoption_bool(enable_PDF_password)) 30.53 - guit->misc->pdf_password(&owner_pass, &user_pass, 30.54 - (void *)settings->output); 30.55 - else 30.56 -@@ -789,7 +786,7 @@ 30.57 - { 30.58 - nserror res = NSERROR_OK; 30.59 - 30.60 -- if (option_enable_PDF_password && owner_pass != NULL ) { 30.61 -+ if (nsoption_bool(enable_PDF_password) && owner_pass != NULL ) { 30.62 - HPDF_SetPassword(pdf_doc, owner_pass, user_pass); 30.63 - HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16); 30.64 - free(owner_pass); 30.65 ---- a/frontends/gtk/scaffolding.c 30.66 -+++ b/frontends/gtk/scaffolding.c 30.67 -@@ -731,14 +731,14 @@ 30.68 - 30.69 - free(url_name); 30.70 - 30.71 -- strncpy(dirname, option_downloads_directory, PATH_MAX); 30.72 -+ strncpy(dirname, nsoption_charp(downloads_directory), PATH_MAX); 30.73 - strncat(dirname, "/", PATH_MAX - strlen(dirname)); 30.74 - dirname[PATH_MAX - 1] = '\0'; 30.75 - 30.76 - /* this way the scale used by PDF functions is synchronized with that 30.77 - * used by the all-purpose print interface 30.78 - */ 30.79 -- haru_nsfont_set_scale((float)option_export_scale / 100); 30.80 -+ haru_nsfont_set_scale((float)nsoption_int(export_scale) / 100); 30.81 - 30.82 - save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window, 30.83 - GTK_FILE_CHOOSER_ACTION_SAVE,
31.1 --- a/netsurf/stuff/patches/openssl.patch Thu Oct 04 16:01:47 2018 +0300 31.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 31.3 @@ -1,72 +0,0 @@ 31.4 -From e8a9e3744523671228fef385ce7e1e11f93283b0 Mon Sep 17 00:00:00 2001 31.5 -From: Vincent Sanders <vince@kyllikki.org> 31.6 -Date: Sun, 20 Nov 2016 12:14:36 +0000 31.7 -Subject: fix openSSL 1.1.0 X509 certificate handling 31.8 - 31.9 ---- 31.10 -diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c 31.11 -index 66970ef..7ddf512 100644 31.12 ---- a/content/fetchers/curl.c 31.13 -+++ b/content/fetchers/curl.c 31.14 -@@ -128,6 +128,26 @@ static char fetch_error_buffer[CURL_ERROR_SIZE]; 31.15 - static char fetch_proxy_userpwd[100]; 31.16 - 31.17 - 31.18 -+/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed */ 31.19 -+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) 31.20 -+static int ns_X509_up_ref(X509 *cert) 31.21 -+{ 31.22 -+ cert->references++; 31.23 -+ return 1; 31.24 -+} 31.25 -+ 31.26 -+static void ns_X509_free(X509 *cert) 31.27 -+{ 31.28 -+ cert->references--; 31.29 -+ if (cert->references == 0) { 31.30 -+ X509_free(cert); 31.31 -+ } 31.32 -+} 31.33 -+#else 31.34 -+#define ns_X509_up_ref X509_up_ref 31.35 -+#define ns_X509_free X509_free 31.36 -+#endif 31.37 -+ 31.38 - /** 31.39 - * Initialise a cURL fetcher. 31.40 - */ 31.41 -@@ -438,7 +458,7 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx) 31.42 - */ 31.43 - if (!fetch->cert_data[depth].cert) { 31.44 - fetch->cert_data[depth].cert = X509_STORE_CTX_get_current_cert(x509_ctx); 31.45 -- fetch->cert_data[depth].cert->references++; 31.46 -+ ns_X509_up_ref(fetch->cert_data[depth].cert); 31.47 - fetch->cert_data[depth].err = X509_STORE_CTX_get_error(x509_ctx); 31.48 - } 31.49 - 31.50 -@@ -815,10 +835,7 @@ static void fetch_curl_free(void *vf) 31.51 - } 31.52 - 31.53 - for (i = 0; i < MAX_CERTS && f->cert_data[i].cert; i++) { 31.54 -- f->cert_data[i].cert->references--; 31.55 -- if (f->cert_data[i].cert->references == 0) { 31.56 -- X509_free(f->cert_data[i].cert); 31.57 -- } 31.58 -+ ns_X509_free(f->cert_data[i].cert); 31.59 - } 31.60 - 31.61 - free(f); 31.62 -@@ -986,10 +1003,7 @@ curl_start_cert_validate(struct curl_fetch_info *f, 31.63 - X509_get_pubkey(certs[depth].cert)); 31.64 - 31.65 - /* and clean up */ 31.66 -- certs[depth].cert->references--; 31.67 -- if (certs[depth].cert->references == 0) { 31.68 -- X509_free(certs[depth].cert); 31.69 -- } 31.70 -+ ns_X509_free(certs[depth].cert); 31.71 - } 31.72 - 31.73 - msg.type = FETCH_CERT_ERR; 31.74 --- 31.75 -cgit v0.9.0.3-65-g4555
32.1 --- a/netsurf/stuff/patches/series Thu Oct 04 16:01:47 2018 +0300 32.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 32.3 @@ -1,11 +0,0 @@ 32.4 -# from https://www.archlinux.org/packages/community/i686/netsurf/ 32.5 -#openssl.patch 32.6 - 32.7 -# from https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/netsurf/files 32.8 -# (modified files placing) 32.9 -#netsurf-3.6-CFLAGS.patch 32.10 -#netsurf-3.6-conditionally-include-image-headers.patch 32.11 -#netsurf-3.6-pdf-writer.patch 32.12 -#netsurf-3.6-gstreamer.patch 32.13 - 32.14 -#headers.patch
33.1 --- a/nsgenbind/receipt Thu Oct 04 16:01:47 2018 +0300 33.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 33.3 @@ -1,32 +0,0 @@ 33.4 -# SliTaz package receipt v2. 33.5 - 33.6 -PACKAGE="nsgenbind" 33.7 -COMMIT="dd752ec19370014f7b222f4983c52ddbbe3e66cf" 33.8 -VERSION="0.4-170323" 33.9 -CATEGORY="libs" 33.10 -SHORT_DESC="NetSurf JavaScript binding generator" 33.11 -MAINTAINER="al.bobylev@gmail.com" 33.12 -LICENSE="GPL" 33.13 -WEB_SITE="http://git.netsurf-browser.org/nsgenbind.git/" 33.14 - 33.15 -TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2" 33.16 -BASE_URL="http://git.netsurf-browser.org/$PACKAGE.git/snapshot" 33.17 -if [ -n "$COMMIT" ]; then 33.18 - WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2" 33.19 -else 33.20 - WGET_URL="$BASE_URL/release/$VERSION.tar.bz2" 33.21 -fi 33.22 - 33.23 -BUILD_DEPENDS="netsurf-buildsystem" 33.24 - 33.25 -compile_rules() { 33.26 - [ -z "$COMMIT" ] && cd $VERSION 33.27 - 33.28 - make \ 33.29 - PREFIX=/usr \ 33.30 - install 33.31 -} 33.32 - 33.33 -genpkg_rules() { 33.34 - copy @std 33.35 -}