diff options
Diffstat (limited to 'libre/netsurf')
| -rw-r--r-- | libre/netsurf/PKGBUILD | 33 | ||||
| -rw-r--r-- | libre/netsurf/netsurf.sh | 4 |
2 files changed, 19 insertions, 18 deletions
diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD index 12031630d..bb14d364b 100644 --- a/libre/netsurf/PKGBUILD +++ b/libre/netsurf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176151 2016-05-23 18:27:18Z arodseth $ +# $Id: PKGBUILD 196979 2016-11-26 23:12:42Z arodseth $ # Maintainer (Arch): Alexander F Rødseth <xyproto@archlinux.org> # Contributor (Arch): Paulo Matias <matiasΘarchlinux-br·org> # Contributor (Arch): Georgij Kondratjev <smpuj@bk.ru> @@ -6,8 +6,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=netsurf -pkgver=3.5 -pkgrel=4.parabola1 +pkgver=3.6 +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/' @@ -15,23 +15,25 @@ license=('MIT' 'GPL2') replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) 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' + 'libnsbmp>=0.1.4' 'libnsgif>=0.1.4' 'libcss>=0.6.1' + 'libdom>=0.3.1' 'libnsutils>=0.0.3' 'libutf8proc>=1.3.1' 'gtk3' 'duktape') makedepends=('re2c' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind>=0.3' - 'inetutils' 'libutf8proc>1.3.1-2' 'git' 'setconf' 'check' 'gtk3' + 'inetutils' 'libutf8proc>1.3.1' 'git' 'setconf' 'check' 'gtk3' 'duktape') -source=("git://git.netsurf-browser.org/netsurf.git#tag=release/$pkgver" 'netsurf.sh') -sha256sums=('SKIP' '70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b') +source=("git://git.netsurf-browser.org/netsurf.git#tag=release/$pkgver" + netsurf.sh) +sha256sums=('SKIP' + 'f2e2f61f1864da57cafa74ffdbefac2f9e1d55d9627e82ef923d4931684c5c49') prepare() { cd "$pkgname" - sed 's:_BSD_SOURCE:_DEFAULT_SOURCE:' -i gtk/Makefile.target - sed 's:netsurf-gtk:netsurf:' -i gtk/res/netsurf-gtk.desktop + sed 's:netsurf-gtk:netsurf:' -i frontends/gtk/res/netsurf-gtk.desktop 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 + setconf Makefile.defaults NETSURF_UA_FORMAT_STRING '"NetSurf/%d.%d (%s; Parabola GNU/Linux-libre)"' setconf Makefile.defaults NETSURF_USE_DUKTAPE YES @@ -116,14 +118,13 @@ package() { 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" + # Script install -Dm755 "../$pkgname.sh" "$pkgdir/usr/bin/$pkgname" # Desktop shortcut - install -Dm644 "gtk/res/$pkgname.xpm" \ + install -Dm644 "frontends/gtk/res/$pkgname.xpm" \ "$pkgdir/usr/share/pixmaps/$pkgname.xpm" - install -Dm644 "gtk/res/$pkgname-gtk.desktop" \ + install -Dm644 "frontends/gtk/res/$pkgname-gtk.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" # License @@ -131,8 +132,8 @@ package() { "$pkgdir/usr/share/licenses/$pkgname/COPYING" # Fix path - mv "$pkgdir/usr/share/netsurf/:./gtk/res/"* "$pkgdir/usr/share/netsurf/" - rmdir "$pkgdir/usr/share/netsurf/"{:./gtk/res,:./gtk,:.} + #mv "$pkgdir/usr/share/netsurf/:./gtk/res/"* "$pkgdir/usr/share/netsurf/" + #rmdir "$pkgdir/usr/share/netsurf/"{:./gtk/res,:./gtk,:.} } # vim:set ts=2 sw=2 et: diff --git a/libre/netsurf/netsurf.sh b/libre/netsurf/netsurf.sh index 01ff68450..da2254763 100644 --- a/libre/netsurf/netsurf.sh +++ b/libre/netsurf/netsurf.sh @@ -1,7 +1,7 @@ #!/bin/sh shortname=`echo $LANG | cut -b1-2` if [[ -d /usr/share/netsurf/$shortname ]]; then - /usr/bin/netsurf.elf "$@" + /usr/bin/netsurf-gtk3 "$@" else - LANG=en /usr/bin/netsurf.elf "$@" + LANG=en /usr/bin/netsurf-gtk3 "$@" fi |