From b437ef721c78da10eeac9696363f0d6966268ca4 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 3 Jun 2020 23:07:10 +0300 Subject: [PATCH] Revert "netsurf: update to 3.10" Compiler tells about syntax errors. --- x11-packages/netsurf/build.sh | 36 ++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/x11-packages/netsurf/build.sh b/x11-packages/netsurf/build.sh index 661176a7a..874f68e75 100644 --- a/x11-packages/netsurf/build.sh +++ b/x11-packages/netsurf/build.sh @@ -2,25 +2,35 @@ TERMUX_PKG_HOMEPAGE=http://www.netsurf-browser.org/ TERMUX_PKG_DESCRIPTION="NetSurf is a free, open source web browser" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Pliushch " -TERMUX_PKG_VERSION=3.10 +TERMUX_PKG_VERSION=3.9 +TERMUX_PKG_REVISION=14 TERMUX_PKG_SRCURL=http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=495adf6b6614ce36fca6c605f7c321f9cb4a3df838043158122678ce2b3325b7 +TERMUX_PKG_SHA256=11e384eaf47e65c186da5001f1055a02f2d72ff17b50f403b8392546a2cf65ff TERMUX_PKG_DEPENDS="desktop-file-utils, exo, libjpeg-turbo, libpng, gtk3, openssl, libcurl, libiconv, libwebp" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gtk3" TERMUX_PKG_BUILD_IN_SRC=true - -termux_step_make() { - export HOST=$($CC -dumpmachine) - export BUILD=$($CC_FOR_BUILD -dumpmachine) - export CFLAGS+=" $CPPFLAGS" - export CXXFLAGS+=" $CPPFLAGS" +termux_step_configure () { + echo CC=$CC + export HOST=`$CC -dumpmachine` + export BUILD=`$CC_FOR_BUILD -dumpmachine` + export CFLAGS+=" -I${TERMUX_PREFIX}/include" + export CPPFLAGS+=" -I${TERMUX_PREFIX}/include" + export CXXFLAGS+=" -I${TERMUX_PREFIX}/include" mkdir -p netsurf/build/Linux-gtk3 - # Note: NETSURF_USE_DUKTAPE= disables javascript, because I couldn't figure out how to build # required the nsgenbind tool so that it can be executed on the *host* (it is used during the build process only) - make PREFIX="${TERMUX_PREFIX}" NETSURF_GTK_MAJOR=3 NETSURF_USE_DUKTAPE=NO NETSURF_USE_LIBICONV_PLUG=NO toolchain=clang + make PREFIX="${TERMUX_PREFIX}" NETSURF_GTK_MAJOR=3 NETSURF_USE_DUKTAPE=NO NETSURF_USE_LIBICONV_PLUG=NO toolchain=clang } - -termux_step_make_install() { - make install PREFIX="${TERMUX_PREFIX}" NETSURF_GTK_MAJOR=3 NETSURF_USE_DUKTAPE=NO NETSURF_USE_LIBICONV_PLUG=NO toolchain=clang +termux_step_make() { + # Nothing to do + echo CC=$CC } +termux_step_make_install () { + echo CC=$CC + export HOST=`$CC -dumpmachine` + export BUILD=`$CC_FOR_BUILD -dumpmachine` + export CFLAGS+=" -I${TERMUX_PREFIX}/include" + export CPPFLAGS+=" -I${TERMUX_PREFIX}/include" + export CXXFLAGS+=" -I${TERMUX_PREFIX}/include" + make install PREFIX="${TERMUX_PREFIX}" NETSURF_GTK_MAJOR=3 NETSURF_USE_DUKTAPE=NO NETSURF_USE_LIBICONV_PLUG=NO toolchain=clang +}