Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

1 files changed, 25 insertions, 20 deletions

diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD
index 48cfa3d30..e4fdaed84 100644
--- a/libre/netsurf/PKGBUILD
+++ b/libre/netsurf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 122517 2014-11-13 13:56:42Z arodseth $
+# $Id: PKGBUILD 129734 2015-03-22 00:55:20Z arodseth $
 # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
 # Contributor (Arch): Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor (Arch): Georgij Kondratjev <smpuj@bk.ru>
@@ -6,22 +6,20 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=netsurf
-pkgver=3.2
-pkgrel=2.parabola1
+pkgver=3.3
+pkgrel=1.parabola1
 pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
 license=('MIT' 'GPL2')
 replaces=(${pkgname}-libre)
 conflicts=(${pkgname}-libre)
-depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.4.0' 'libdom>=0.1.1' 'gtk2') # gtk3
-makedepends=('re2c' 'gendesk' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils' 'imagemagick')
+depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.5.0' 'libdom>=0.1.2' 'gtk2' 'libutf8proc' 'libnsutils' 'libwebp') # gtk3
+makedepends=('re2c' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils' 'libwebp')
 install="$pkgname.install"
-source=("http://source.netsurf-browser.org/art.git/plain/logo/emblem/NetSurf.svg"
-        "http://download.$pkgname-browser.org/$pkgname/releases/source/$pkgname-$pkgver-src.tar.gz"
+source=("http://download.$pkgname-browser.org/$pkgname/releases/source/$pkgname-$pkgver-src.tar.gz"
         'netsurf.sh')
-sha256sums=('0b8ef911f7154079d16791167cd905f0df8eed00bf97aecb5edf1cf4915757c2'
-            '04ffeb8335c59cbc23371b79ae3b178002e6e95c35225ef62db4b155ecc7e213'
+sha256sums=('23f92a0940f577b9605f2e54786fea3521680d32d6c00f2a3db1eae3f29e3686'
             '70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b')
 
 prepare() {
@@ -92,12 +90,10 @@ prepare() {
   sed -i 's|nsgenbind -g|nsgenbind|
          ' javascript/Makefile
 
-  cd ..
+  cd "$srcdir/$pkgname-$pkgver/gtk"
 
-  convert NetSurf.svg -size 128x128 netsurf.png
-  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'
+  sed 's:_BSD_SOURCE:_DEFAULT_SOURCE:' -i Makefile.target
+  sed 's:netsurf-gtk:netsurf:' -i res/netsurf-gtk.desktop
 }
 
 build() {
@@ -111,14 +107,23 @@ build() {
 }
 
 package() {
-  make -C "$pkgname-$pkgver" install PREFIX=/usr DESTDIR="$pkgdir"
+  cd "$pkgname-$pkgver"
+
+  make install PREFIX=/usr DESTDIR="$pkgdir"
+
+  # Script and executable
   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 -Dm644 "$pkgname.desktop" \
+  install -Dm755 "../$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+
+  # Desktop shortcut
+  install -Dm644 "gtk/res/$pkgname.xpm" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
+  install -Dm644 "gtk/res/$pkgname-gtk.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$pkgname-$pkgver/COPYING" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # License
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 # vim:set ts=2 sw=2 et: