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

[Alexander Rødseth]

    Date: Tuesday, April 29, 2014 @ 15:53:01
  Author: arodseth
Revision: 110427

upgpkg: netsurf 3.1-1

Modified:
  netsurf/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-29 13:03:10 UTC (rev 110426)
+++ PKGBUILD	2014-04-29 13:53:01 UTC (rev 110427)
@@ -11,7 +11,7 @@
 arch=('x86_64' 'i686')
 url='http://www.netsurf-browser.org/'
 license=('MIT' 'GPL2')
-depends=('gtk3' 'libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.3.0' 'libdom>=0.1.0')
+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"
@@ -25,6 +25,11 @@
   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() {
@@ -32,8 +37,9 @@
     PREFIX=/usr \
     TARGET=gtk \
     NETSURF_USE_WEBP=YES \
-    NETSURF_USE_VIDEO=NO \
-    NETSURF_GTK_MAJOR=3
+    NETSURF_USE_VIDEO=NO
+    #NETSURF_GTK_MAJOR=3 # The latest version of GTK3 has deprecated several
+                         # features that are used by NetSurf.
 }
 
 package() {
@@ -45,6 +51,9 @@
     "$pkgdir/usr/share/applications/$pkgname.desktop"
   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: