netsurf-libre-3.1-1: updating version

2 files changed, 26 insertions, 21 deletions

diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
index 6d028e732..cd6a29096 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105500 2014-02-09 11:01:04Z arodseth $
+# $Id: PKGBUILD 110427 2014-04-29 13:53:01Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
@@ -7,8 +7,8 @@
 
 _pkgname=netsurf
 pkgname=netsurf-libre
-pkgver=3.0
-pkgrel=7
+pkgver=3.1
+pkgrel=1
 pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
@@ -16,15 +16,15 @@ license=('MIT' 'GPL2')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss' 'libwebp' 'libdom' 'lcms') # 'libharu' 'gstreamer0.10'
-makedepends=('js' 're2c' 'gendesk' 'netsurf-buildsystem' 'libglade' 'addinclude')
+depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.3.0' 'libdom>=0.1.0' 'js185' 'gtk2') # gtk3
+makedepends=('js185' 're2c' 'gendesk' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils')
 install="$_pkgname.install"
 source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
         "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz"
         'netsurf.sh')
 sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
-            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6'
-            '7aef20cc7b2e2e7225237f2f94b5a0074caeb8ec07075c58429b0345ca566f8d')
+            '1ef12b2e2bc68f9eff8465646b7359e3cb483e1042aed750cc283a70dd4c540c'
+            '70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b')
 
 prepare() {
   cd "$_pkgname-$pkgver"
@@ -92,35 +92,40 @@ prepare() {
            \!NetSurf/Resources/it/welcome.html\,faf \
            \!NetSurf/Resources/ja/welcome.html\,faf
 
-  addinclude image/rsvg.c stdio
-  addinclude image/mng.c stdio
-  addinclude image/png.c stdio
+  cd ..
 
   gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
     --genericname 'Web Browser' --comment 'Lightweight web browser' \
     --mimetypes 'text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo'
+
+  # If patching the GTK3 deprecated errors by including files from
+  # /usr/include/gtk-3.0/gtk/deprecated, something like this might be useful:
+  #setconf "$_pkgname-$pkgver/Makefile.defaults" \
+  #  CFLAGS " -DGTK_COMPILATION"
 }
 
 build() {
-  cd "$_pkgname-$pkgver"
-
-  make \
+  make -C "$_pkgname-$pkgver" \
     PREFIX=/usr \
     TARGET=gtk \
     NETSURF_USE_WEBP=YES \
     NETSURF_USE_VIDEO=NO
+    #NETSURF_GTK_MAJOR=3 # The latest version of GTK3 has deprecated several
+                         # features that are used by NetSurf.
 }
 
 package() {
-  cd "$_pkgname-$pkgver"
-
-  make install PREFIX=/usr DESTDIR="$pkgdir" NETSURF_USE_WEBP=YES
+  make -C "$_pkgname-$pkgver" install PREFIX=/usr DESTDIR="$pkgdir"
   mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf"
-  install -Dm755 "../$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
-  install -Dm644 "../$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
+  install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
   install -Dm644 "$_pkgname.desktop" \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+  install -Dm644 "$_pkgname-$pkgver/COPYING" \
+    "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+  # use softlinks instead of hardlinks
+  rm -r "$pkgdir/usr/share/netsurf/C"
+  ln -s '/usr/share/netsurf/en' "$pkgdir/usr/share/netsurf/C"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf-libre/netsurf.sh
index b74f388af..01ff68450 100644
--- a/libre/netsurf-libre/netsurf.sh
+++ b/libre/netsurf-libre/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.elf "$@"
 else
-	LANG=en /usr/bin/netsurf.elf "$@"
+  LANG=en /usr/bin/netsurf.elf "$@"
 fi