[arch-commits] Commit in netsurf/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Monday, April 28, 2014 @ 16:34:16
  Author: arodseth
Revision: 110373

Builds, but js does not work

Modified:
  netsurf/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-28 14:23:22 UTC (rev 110372)
+++ PKGBUILD	2014-04-28 14:34:16 UTC (rev 110373)
@@ -11,8 +11,8 @@
 arch=('x86_64' 'i686')
 url='http://www.netsurf-browser.org/'
 license=('MIT' 'GPL2')
-depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss>=0.3.0' 'libwebp' 'libdom>=0.1.0' 'lcms') # 'libharu' 'gstreamer0.10'
-makedepends=('js' 're2c' 'gendesk' 'netsurf-buildsystem' 'libglade' 'addinclude')
+depends=('gtk2' 'libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.3.0' 'libdom>=0.1.0')
+makedepends=('gjs' 'js' 're2c' 'gendesk' 'netsurf-buildsystem' 'libglade')
 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"
@@ -22,12 +22,6 @@
             '70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b')
 
 prepare() {
-  cd "$pkgname-$pkgver"
-
-  addinclude image/rsvg.c stdio
-  addinclude image/mng.c stdio
-  addinclude image/png.c stdio
-
   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'
@@ -36,23 +30,25 @@
 build() {
   cd "$pkgname-$pkgver"
 
+  # TODO: Find a javascript library that works with netsurf
   make \
     PREFIX=/usr \
     TARGET=gtk \
     NETSURF_USE_WEBP=YES \
-    NETSURF_USE_VIDEO=NO
+    NETSURF_USE_VIDEO=NO \
+    NETSURF_USE_JS=NO \
+    NETSURF_USE_MOZJS=NO
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-
-  make install PREFIX=/usr DESTDIR="$pkgdir"
+  make -C "$pkgname-$pkver" 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"
 }
 
 # vim:set ts=2 sw=2 et: