Merge pull request #80 from kimperator/master

Updated Samen Network Manager and z2 optimized Netsurf

aur/hubbub-svn/PKGBUILD

@@ -0,0 +1,36 @@
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+pkgname=hubbub-svn
+pkgver=12160
+pkgrel=1
+plugrel=1
+pkgdesc="An HTML5 compliant parsing library"
+arch=('arm' 'i686' 'x86_64')
+url="http://www.netsurf-browser.org/projects/hubbub/"
+license=('MIT')
+depends=('libparserutils')
+makedepends=('subversion')
+provides=('hubbub')
+conflics=('hubbub')
+_svntrunk=svn://svn.netsurf-browser.org/trunk/hubbub
+_svnmod=hubbub
+
+build() {
+  cd "$srcdir"
+
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+
+  cd $_svnmod
+  sed -i "s/-Werror//g" $srcdir/$_svnmod/Makefile
+  make || return 1
+  make PREFIX="/usr" DESTDIR="$pkgdir/" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:

aur/libcss-svn/PKGBUILD

@@ -0,0 +1,38 @@
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+pkgname=libcss-svn
+pkgver=12446
+pkgrel=1
+plugrel=1
+pkgdesc="A CSS parser and selection engine"
+arch=('arm' 'i686' 'x86_64')
+url="http://www.netsurf-browser.org/projects/libcss/"
+license=('MIT')
+depends=('libparserutils-svn' 'libwapcaplet-svn')
+makedepends=('subversion')
+provides=('libcss')
+_svntrunk=svn://svn.netsurf-browser.org/trunk/libcss
+_svnmod=libcss
+
+build() {
+  cd "$srcdir"
+
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+
+  cd "$_svnmod"
+
+  msg2 "Building..."
+  sed -i "s/-Werror//g" Makefile
+  make
+  make PREFIX="/usr" DESTDIR="$pkgdir/" install
+
+  msg2 "Packaging license..."
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:

aur/libnsbmp-svn/PKGBUILD

@@ -0,0 +1,35 @@
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+pkgname=libnsbmp-svn
+pkgver=12170
+pkgrel=1
+plugrel=1
+pkgdesc="A library for decoding BMP and ICO image formats"
+arch=('arm' 'i686' 'x86_64')
+url="http://www.netsurf-browser.org/projects/libnsbmp/"
+license=('MIT')
+provides=('libnsbmp')
+conflicts=('libnsbmp')
+makedepends=('subversion')
+_svntrunk=svn://svn.netsurf-browser.org/trunk/libnsbmp
+_svnmod=libnsbmp
+
+build() {
+  cd "$srcdir"
+
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+
+  cd $_svnmod
+
+  make || return 1
+  make PREFIX="/usr" DESTDIR="$pkgdir/" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:

aur/libnsfb-svn/PKGBUILD

@@ -0,0 +1,34 @@
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+pkgname=libnsfb-svn
+pkgver=12203
+pkgrel=1
+plugrel=1
+pkgdesc="netsurf framebuffer library"
+arch=('arm' 'i686' 'x86_64')
+url="http://www.netsurf-browser.org/projects/libnsfb/"
+license=('MIT')
+provides=('libnsfb')
+makedepends=('subversion')
+_svntrunk=svn://svn.netsurf-browser.org/trunk/libnsfb
+_svnmod=libnsfb
+
+build() {
+  cd "$srcdir"
+
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+
+  cd $_svnmod
+
+  make || return 1
+  make PREFIX="/usr" DESTDIR="$pkgdir/" install
+
+#  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:

aur/libnsgif-svn/PKGBUILD

@@ -0,0 +1,39 @@
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+pkgname=libnsgif-svn
+pkgver=12168
+pkgrel=1
+plugrel=1
+pkgdesc="A library for decoding the GIF image format"
+arch=('arm' 'i686' 'x86_64')
+url="http://www.netsurf-browser.org/projects/libnsgif/"
+license=('MIT')
+makedepends=('subversion')
+provides=('libnsgif')
+conflicts=('libnsgif')
+_svntrunk=svn://svn.netsurf-browser.org/trunk/libnsgif
+_svnmod=libnsgif
+
+build() {
+  cd "$srcdir"
+
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+
+  cd $_svnmod
+
+  # Turn off strict aliasing for now
+  cat Makefile | sed 's/-pedantic/-pedantic -fno-strict-aliasing/g' > Makefile.tmp
+  mv Makefile.tmp Makefile
+
+  make || return 1
+  make PREFIX="/usr" DESTDIR="$pkgdir/" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:

aur/libparserutils-svn/PKGBUILD

@@ -0,0 +1,49 @@
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+pkgname=libparserutils-svn
+pkgver=12215
+pkgrel=1
+plugrel=1
+pkgdesc="A library for building efficient parsers"
+arch=('any')
+url="http://www.netsurf-browser.org/projects/libparserutils/"
+license=('MIT')
+provides=('libparserutils')
+conflicts=('libparserutils')
+makedepends=('subversion')
+_svntrunk=svn://svn.netsurf-browser.org/trunk/libparserutils
+_svnmod=libparserutils
+
+build() {
+  cd "$srcdir"
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+  msg "SVN checkout done or server timeout"
+
+  cd $_svnmod
+
+  msg2 "Patching..."
+	sed -i 's/static uint16_t utf16;//' src/input/inputstream.c
+	sed -i 's/static uint16_t utf32;//' src/input/inputstream.c
+	sed -i 's/utf16 = parserutils/\/\//' src/input/inputstream.c
+	sed -i 's/utf32 = parserutils/\/\//' src/input/inputstream.c
+	sed -i 's/SLEN("UTF-16"/\/\//' src/input/inputstream.c
+	sed -i 's/SLEN("UTF-32"/\/\//' src/input/inputstream.c
+
+  msg2 "Compiling..."
+  make
+}
+
+package() {
+  cd $_svnmod
+
+  msg2 "Packaging..."
+  make PREFIX="/usr" DESTDIR="$pkgdir/" install
+
+  msg2 "Packaging license..."
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:

aur/libwapcaplet-svn/PKGBUILD

@@ -0,0 +1,34 @@
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+pkgname=libwapcaplet-svn
+pkgver=12163
+pkgrel=1
+plugrel=1
+pkgdesc="A string internment library with rapid string comparison"
+arch=('arm' 'i686' 'x86_64')
+url="http://www.netsurf-browser.org/projects/libwapcaplet/"
+license=('MIT')
+makedepends=('subversion')
+provides=('libwapcaplet')
+_svntrunk=svn://svn.netsurf-browser.org/trunk/libwapcaplet
+_svnmod=libwapcaplet
+
+build() {
+  cd "$srcdir"
+
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+
+  cd $_svnmod
+
+  make || return 1
+  make PREFIX="/usr" DESTDIR="$pkgdir/" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:

aur/mouse-emul-git/PKGBUILD

@@ -0,0 +1,39 @@
+# Maintainer: Kai Uwe Jesussek <kajot@gmx.net>
+
+pkgname=mouse-emul-git
+pkgver=20110611
+pkgrel=1
+plugrel=1
+pkgdesc="Tiny mouse emulator"
+arch=('arm' 'i686' 'x86_64')
+license=('GPL2')
+provides=('mouse-emul')
+makedepends=('git')
+_gitroot=("https://github.com/anarsoul/mouse-emul.git")
+_gitname=("mouse-emul")
+
+build() {
+  cd ${srcdir}
+
+ ## Git checkout
+  if [ -d ${srcdir}/${_gitname} ] ; then
+    msg "Git checkout:  Updating existing tree"
+    cd ${_gitname} && git pull origin
+    msg "Git checkout:  Tree has been updated"
+  else
+    msg "Git checkout:  Retrieving sources"
+    git clone ${_gitroot}
+  fi
+  msg "Checkout completed"
+
+ ## Build
+  rm -rf ${srcdir}/${_gitname}-build
+  cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
+  cd ${srcdir}/${_gitname}-build
+  make DESTDIR=${pkgdir} install
+  mkdir ${pkgdir}/etc/
+  touch ${pkgdir}/etc/mouse-emulrc
+}
+package() {
+  true
+}

aur/netsurf-svn-z2/0002-netsurf-add-zipit-keymap.patch

@@ -0,0 +1,193 @@
+Index: netsurf/framebuffer/fbtk/event.c
+===================================================================
+--- netsurf/framebuffer/fbtk/event.c	(revision 12174)
++++ netsurf/framebuffer/fbtk/event.c	(working copy)
+@@ -250,7 +250,7 @@
+ 	-1,  -1,  -1,  13,  -1,  -1,  -1,  -1,  -1,  -1, /*  10 -  19 */
+ 	-1,  -1,  -1,  -1,  -1,  -1,  -1,  27,  -1,  -1, /*  20 -  29 */
+ 	-1,  -1, ' ', '!', '"', '~', '$',  -1, '&', '@', /*  30 -  39 */
+-	'(', ')', '*', '+', '<', '_', '>', '?', ')', '!', /*  40 -  49 */
++	'(', ')', '*', '+', '(', '_', ')', '?', ')', '!', /*  40 -  49 */
+ 	'"', 243, '$', '%', '^', '&', '*', '(', ';', ':', /*  50 -  59 */
+ 	'<', '+', '>', '?', '@',  -1,  -1,  -1,  -1,  -1, /*  60 -  69 */
+ 	-1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, /*  70 -  79 */
+@@ -261,16 +261,34 @@
+ 	'X', 'Y', 'Z',  -1,  -1,  -1,  -1,  -1,  -1,  -1, /* 120 - 129 */
+ };
+ 
+-
++static int alt_keymap[] = {
++	/* 0    1    2    3    4    5    6    7    8    9               */
++	-1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   8,   9, /*   0 -   9 */
++	-1,  -1,  -1,  13,  -1,  -1,  -1,  -1,  -1,  -1, /*  10 -  19 */
++	-1,  -1,  -1,  -1,  -1,  -1,  -1,  27,  -1,  -1, /*  20 -  29 */
++	-1,  -1, ' ', '!', '"', '#', '$',  -1, '&','\'', /*  30 -  39 */
++	'(', ')', '*', '+', '<', '-', '>', '/', '0', '1', /*  40 -  49 */
++	'2', '3', '4', '5', '6', '7', '8', '9', ':', ';', /*  50 -  59 */
++	'<', '=', '>', '?', '@',  -1,  -1,  -1,  -1,  -1, /*  60 -  69 */
++	-1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, /*  70 -  79 */
++	-1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, /*  80 -  89 */
++	-1, '[','\\', ']', '~', '_', '`', '$', '=', '+', /*  90 -  99 */
++	'&', '3', '@', '"', '\'', '8', '[', ']', '-', '?', /* 100 - 109 */
++	'_', '9', '0', '1', '4', '#', '5', '7', '*', '2', /* 110 - 119 */
++	'/', '6', '!',  -1,  -1,  -1,  -1,  -1,  -1,  -1, /* 120 - 129 */
++};
+ /* exported function documented in fbtk.h */
+ int
+ fbtk_keycode_to_ucs4(int code, uint8_t mods)
+ {
+ 	int ucs4 = -1;
+ 
+-	if (mods) {
++	if (mods & FBTK_MT_SHIFT) {
+ 		if ((code >= 0) && (code < (int) NOF_ELEMENTS(sh_keymap)))
+ 			ucs4 = sh_keymap[code];
++	} else if (mods & FBTK_MT_ALT) {
++		if ((code >= 0) && (code < (int) NOF_ELEMENTS(sh_keymap)))
++			ucs4 = alt_keymap[code];
+ 	} else {
+ 		if ((code >= 0) && (code < (int) NOF_ELEMENTS(keymap)))
+ 			ucs4 = keymap[code];
+Index: netsurf/framebuffer/fbtk/text.c
+===================================================================
+--- netsurf/framebuffer/fbtk/text.c	(revision 12174)
++++ netsurf/framebuffer/fbtk/text.c	(working copy)
+@@ -248,11 +248,18 @@
+ 	if (cbi->event->type != NSFB_EVENT_KEY_DOWN) {
+ 		switch (value) {
+ 		case NSFB_KEY_RSHIFT:
+-			modifier &= ~1;
++		case NSFB_KEY_LSHIFT:
++			modifier &= ~(FBTK_MT_SHIFT);
+ 			break;
++		
++		case NSFB_KEY_LALT:
++		case NSFB_KEY_RALT:
++			modifier &= ~(FBTK_MT_ALT);
++			break;
+ 
+-		case NSFB_KEY_LSHIFT:
+-			modifier &= ~(1<<1);
++		case NSFB_KEY_LCTRL:
++		case NSFB_KEY_RCTRL:
++			modifier &= ~(FBTK_MT_CTRL);
+ 			break;
+ 
+ 		default:
+@@ -284,22 +291,38 @@
+ 		break;
+ 
+ 	case NSFB_KEY_RSHIFT:
+-		modifier |= 1;
++	case NSFB_KEY_LSHIFT:
++		modifier |= FBTK_MT_SHIFT;
+ 		break;
+ 
+-	case NSFB_KEY_LSHIFT:
+-		modifier |= 1<<1;
++	case NSFB_KEY_LALT:
++	case NSFB_KEY_RALT:
++		modifier |= FBTK_MT_ALT;
+ 		break;
+ 
+-	default:
+-		/* allow for new character and null */
+-		temp = realloc(widget->u.text.text, widget->u.text.idx + 2);
++	case NSFB_KEY_LCTRL:
++	case NSFB_KEY_RCTRL:
++		modifier |= FBTK_MT_CTRL;
++		break;
++	case NSFB_KEY_ESCAPE:
++		temp = realloc(widget->u.text.text, 1);
+ 		if (temp != NULL) {
+ 			widget->u.text.text = temp;
+-			widget->u.text.text[widget->u.text.idx] = fbtk_keycode_to_ucs4(value, modifier);
+-			widget->u.text.text[widget->u.text.idx + 1] = '\0';
+-			widget->u.text.idx++;
++			widget->u.text.text[0] = '\0';
++			widget->u.text.idx = 0;
+ 		}
++		break;
++	default:
++		if (value >= 32 && value < 127) {
++			/* allow for new character and null */
++			temp = realloc(widget->u.text.text, widget->u.text.idx + 2);
++			if (temp != NULL) {
++				widget->u.text.text = temp;
++				widget->u.text.text[widget->u.text.idx] = fbtk_keycode_to_ucs4(value, modifier);
++				widget->u.text.text[widget->u.text.idx + 1] = '\0';
++				widget->u.text.idx++;
++			}
++		}
+ 
+ 		break;
+ 	}
+Index: netsurf/framebuffer/Makefile.target
+===================================================================
+Index: netsurf/framebuffer/gui.c
+===================================================================
+--- netsurf/framebuffer/gui.c	(revision 12174)
++++ netsurf/framebuffer/gui.c	(working copy)
+@@ -712,13 +712,20 @@
+ 			break;
+ 
+ 		case NSFB_KEY_RSHIFT:
+-			modifier |= 1;
++		case NSFB_KEY_LSHIFT:
++			modifier |= FBTK_MT_SHIFT;
+ 			break;
+ 
+-		case NSFB_KEY_LSHIFT:
+-			modifier |= 1<<1;
++		case NSFB_KEY_LALT:
++		case NSFB_KEY_RALT:
++			modifier |= FBTK_MT_ALT;
+ 			break;
+ 
++		case NSFB_KEY_LCTRL:
++		case NSFB_KEY_RCTRL:
++			modifier |= FBTK_MT_CTRL;
++			break;
++
+ 		default:
+ 			ucs4 = fbtk_keycode_to_ucs4(cbi->event->value.keycode,
+ 						    modifier);
+@@ -731,11 +738,18 @@
+ 	case NSFB_EVENT_KEY_UP:
+ 		switch (cbi->event->value.keycode) {
+ 		case NSFB_KEY_RSHIFT:
+-			modifier &= ~1;
++		case NSFB_KEY_LSHIFT:
++			modifier &= ~(FBTK_MT_SHIFT);
+ 			break;
++		
++		case NSFB_KEY_LALT:
++		case NSFB_KEY_RALT:
++			modifier &= ~(FBTK_MT_ALT);
++			break;
+ 
+-		case NSFB_KEY_LSHIFT:
+-			modifier &= ~(1<<1);
++		case NSFB_KEY_LCTRL:
++		case NSFB_KEY_RCTRL:
++			modifier &= ~(FBTK_MT_CTRL);
+ 			break;
+ 
+ 		default:
+Index: netsurf/framebuffer/fbtk.h
+===================================================================
+--- netsurf/framebuffer/fbtk.h	(revision 12174)
++++ netsurf/framebuffer/fbtk.h	(working copy)
+@@ -181,6 +181,12 @@
+  */
+ bool fbtk_tgrab_pointer(fbtk_widget_t *widget);
+ 
++enum fbtk_mod_type {
++	FBTK_MT_SHIFT = 1,
++	FBTK_MT_ALT = 2,
++	FBTK_MT_CTRL = 4,
++};
++
+ /** Convert a framebuffer keycode to ucs4.
+  *
+  * Character mapping between keycode with modifier state and ucs-4.

aur/netsurf-svn-z2/0004-curl-disable-verify-peer.patch

@@ -0,0 +1,13 @@
+Index: content/fetchers/curl.c
+===================================================================
+--- netsurf/content/fetchers/curl.c	(revision 12174)
++++ netsurf/content/fetchers/curl.c	(working copy)
+@@ -586,7 +586,7 @@
+ 		SETOPT(CURLOPT_PROXY, NULL);
+ 	}
+ 
+-	if (urldb_get_cert_permissions(f->url)) {
++	if (1) { //urldb_get_cert_permissions(f->url)) {
+ 		/* Disable certificate verification */
+ 		SETOPT(CURLOPT_SSL_VERIFYPEER, 0L);
+ 		SETOPT(CURLOPT_SSL_VERIFYHOST, 0L);

aur/netsurf-svn-z2/0005-fix-content_get_width_height.patch

@@ -0,0 +1,24 @@
+Index: content/content.c
+===================================================================
+--- netsurf/content/content.c	(revision 12174)
++++ netsurf/content/content.c	(working copy)
+@@ -1306,6 +1306,9 @@
+  */
+ int content_get_width(hlcache_handle *h)
+ {
++	if (h == NULL)
++		return 0;
++
+ 	return content__get_width(hlcache_handle_get_content(h));
+ }
+ 
+@@ -1325,6 +1328,9 @@
+  */
+ int content_get_height(hlcache_handle *h)
+ {
++	if (h == NULL)
++		return 0;
++
+ 	return content__get_height(hlcache_handle_get_content(h));
+ }
+ 

aur/netsurf-svn-z2/PKGBUILD

@@ -0,0 +1,66 @@
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Thanks to: Georgij Kondratjev <smpuj@bk.ru>
+pkgname=netsurf-svn-z2
+pkgver=12470
+pkgrel=1
+plugrel=1
+pkgdesc="Lightweight and fast web browser"
+arch=('arm' 'i686' 'x86_64')
+url="http://www.netsurf-browser.org/"
+license=("GPL")
+depends=('libnsfb-svn' 'libmng' 'curl' 'lcms' 'librsvg' 
+'libnsbmp-svn' 'libnsgif-svn' 'libcss-svn' 'hubbub-svn' 'libpng' 'libmng' 'mouse-emul-git')
+provides=('netsurf')
+conflicts=('netsurf')
+source=('0002-netsurf-add-zipit-keymap.patch'  '0004-curl-disable-verify-peer.patch'  '0005-fix-content_get_width_height.patch' 'netsurf.sh')
+md5sums=('36f5e546979269d93196ceedaa1f6fe8'
+         '41f9b588580af155e563412664935172'
+         '50e1d946985d5d5ae0e85e3f54bdbfd2'
+         '5697422f8ebe615821ff4c8c476c0024')
+_svntrunk=svn://svn.netsurf-browser.org/trunk/netsurf
+_svnmod=netsurf-svn
+
+build() {
+  cd "$srcdir"
+
+  #msg "Fetching two extra files..."
+  curl http://www.sqlite.org/cvstrac/getfile/sqlite/tool/lemon.c -O || return 1
+  curl http://www.sqlite.org/cvstrac/getfile/sqlite/tool/lempar.c -O || return 1
+
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+
+  msg "Preparing..."
+  gcc lemon.c -o lemon
+  PATH=`pwd`:$PATH
+
+  cp -rT $_svnmod $_svnmod-build
+  ln -sf $_svnmod-build netsurf #will not compile otherwise
+  cd netsurf
+  patch -p1 < ../0002-netsurf-add-zipit-keymap.patch
+  patch -p1 < ../0004-curl-disable-verify-peer.patch
+  patch -p1 < ../0005-fix-content_get_width_height.patch
+  echo "override NETSURF_FB_FRONTEND := sdl" > Makefile.config
+
+  sed -i -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ./framebuffer/convert_image.c
+  msg "Compiling Netsurf..."
+  make TARGET=framebuffer || return 1
+  
+  msg "Packaging executables..."
+  mkdir -p ${pkgdir}/usr/bin
+  install nsfb ${pkgdir}/usr/bin
+  install -Dm755 ${srcdir}/netsurf.sh ${pkgdir}/usr/bin/netsurf
+  install -d ${pkgdir}/usr/bin ${pkgdir}/usr/share/netsurf
+
+  msg "Packaging resources..."
+  rm -rf framebuffer/res/.svn gtk/res/docs/.svn
+  cp -RL framebuffer/res ${pkgdir}/usr/share/netsurf
+
+  msg "Cleaning up..."
+  find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf
+}

aur/netsurf-svn-z2/netsurf.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+killall mouse-emul > /dev/null 2>&1
+mouse-emul -d /dev/input/event0&
+NETSURFRES=/usr/share/netsurf/res /usr/bin/nsfb $*
+killall mouse-emul > /dev/null 2>&1
+

aur/samen-git/PKGBUILD

@@ -2,13 +2,14 @@
 
 plugrel=1
 pkgname=samen-git
-pkgver=20110610
+pkgver=20110616
 pkgrel=1
 pkgdesc="samen is a ultra small wpa_supplicant (wpa_cli) action handler."
+url="https://github.com/kimperator/Samen/wiki"
 arch=('arm' 'i686' 'x86_64')
 license=('GPL')
 provides=('samen')
-makedepends=('git')
+makedepends=('git' 'cmake')
 depends=('wpa_supplicant')
 _gitroot=("git://github.com/kimperator/Samen.git")
 _gitname=("Samen")
@@ -31,9 +32,11 @@ build() {
   rm -rf ${srcdir}/${_gitname}-build
   cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
   cd ${srcdir}/${_gitname}-build
-  mkdir -p ${pkgdir}/usr/sbin/
-  gcc src/samen-handler/samen-handler.c -o ${pkgdir}/usr/sbin/samen-handler
-  cp -r additions/arch/etc ${pkgdir}
+  mkdir build
+  cd build
+  cmake ..
+  make DESTDIR=${pkgdir} install
+  cp -r ../additions/arch/etc ${pkgdir}
 }
 package() {
   true