diff options
| -rw-r--r-- | libre/netsurf/PKGBUILD | 25 | ||||
| -rw-r--r-- | libre/netsurf/netsurf-remove_webp.patch | 24 |
2 files changed, 11 insertions, 38 deletions
diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD index 9b9a7d3b2..3c659b5f5 100644 --- a/libre/netsurf/PKGBUILD +++ b/libre/netsurf/PKGBUILD @@ -6,18 +6,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=netsurf -pkgver=3.3 -pkgrel=3.parabola1 +pkgver=3.4 +pkgrel=1.parabola1 pkgdesc='Lightweight and fast web browser, without non-privacy search engines' arch=('x86_64' 'i686' 'armv7h') url='http://www.netsurf-browser.org/' license=('MIT' 'GPL2') replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) -depends=('libmng' 'librsvg' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.5.0' 'libdom>=0.1.2' 'gtk2' 'libnsutils' 'libutf8proc>1.3.1-2') # 'libwebp' 'gtk3' -makedepends=('re2c' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils' 'libutf8proc>1.3.1-2' 'git') # 'libwebp' +depends=('libmng' 'librsvg' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.3' 'libnsgif>=0.1.3' 'libcss>=0.6.0-2' 'libdom>=0.3.0' 'libnsutils>=0.0.2' 'libutf8proc>=1.3.1-3' 'gtk3') # 'duktape' +makedepends=('re2c' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils' 'libutf8proc>1.3.1-2' 'git' 'setconf' 'check' 'gtk3') # 'duktape' install="$pkgname.install" -#source=("git://git.netsurf-browser.org/netsurf.git#commit=3cc80" +#source=("git://git.netsurf-browser.org/netsurf.git#commit=592ff0ef76199e4cc5089e7e76036ae259bcdcd2" source=("git://git.netsurf-browser.org/netsurf.git#tag=release/$pkgver" 'netsurf.sh') sha256sums=('SKIP' @@ -31,7 +31,8 @@ prepare() { sed 's:libutf8proc/::' -i utils/idna.c sed 's:UTF8PROC_CCC_VIRAMA:UTF8PROC_BIDI_CLASS_EN:' -i utils/idna.c sed 's:utf8proc_normalise:utf8proc_reencode:' -i utils/idna.c - # There are several errors. Asking netsurf upstream to look at it. + setconf Makefile.defaults NETSURF_UA_FORMAT_STRING '"NetSurf/%d.%d (%s; Parabola GNU/Linux-libre)"' + setconf Makefile.defaults NETSURF_USE_DUKTAPE NO # remove non-privacy search engines sed -i '\|Google|d @@ -100,19 +101,15 @@ prepare() { } build() { - make -C "$pkgname" \ - PREFIX=/usr \ - TARGET=gtk \ - NETSURF_USE_WEBP=NO \ - NETSURF_USE_VIDEO=NO \ - NETSURF_USE_JS=NO \ - NETSURF_USE_MOZJS=NO # Javascript is disabled, for now. See FS#41582 + make -C "$pkgname" LIBDIR=lib INCLUDEDIR=include PREFIX=/usr TARGET=gtk \ + NETSURF_GTK_MAJOR=3 } package() { cd "$pkgname" - make install PREFIX=/usr DESTDIR="$pkgdir" + make install LIBDIR=lib INCLUDEDIR=include PREFIX=/usr TARGET=gtk \ + NETSURF_GTK_MAJOR=3 DESTDIR="$pkgdir" # Script and executable mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf" diff --git a/libre/netsurf/netsurf-remove_webp.patch b/libre/netsurf/netsurf-remove_webp.patch deleted file mode 100644 index d55ca287d..000000000 --- a/libre/netsurf/netsurf-remove_webp.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- netsurf-3.3.orig/image/image.c 2015-10-02 05:50:57.797404767 +0000 -+++ netsurf-3.3/image/image.c 2015-10-02 05:53:03.592308206 +0000 -@@ -37,8 +37,6 @@ - #include "image/png.h" - #include "image/rsvg.h" - #include "image/svg.h" --#include "image/webp.h" -- - #include "image/image.h" - - /** -@@ -98,12 +96,6 @@ - return error; - #endif - --#ifdef WITH_WEBP -- error = webp_init(); -- if (error != NSERROR_OK) -- return error; --#endif /* WITH_WEBP */ -- - return NSERROR_OK; - } - |