webkit: make geoclue optional, thanks rmull

webkit/.md5sum

@@ -1 +1,2 @@
+60274edffe7f72b3eff3c03b0beef083  gtkdoc-rebase-remove.patch
 f2f01b1fdc7262a2eede81ebed0970b2  webkit-1.8.1.tar.xz

webkit/Pkgfile

@@ -2,17 +2,25 @@
 # URL: http://www.webkitgtk.org/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Brett Goulder, predatorfreak at dcaf-security dot org
-# Depends on: enchant geoclue gst-plugins-base icu libsoup mesa3d
+# Depends on: enchant gst-plugins-base icu libsoup mesa3d libjpeg gtk
+# Nice to have: geoclue
 
 name=webkit
 version=1.8.1
 release=1
-source=(http://webkitgtk.org/releases/$name-$version.tar.xz)
+source=(http://webkitgtk.org/releases/$name-$version.tar.xz
+	gtkdoc-rebase-remove.patch)
 
 build() {
 	cd $name-$version
 
-	./configure \
+	patch -p1 -i $SRC/gtkdoc-rebase-remove.patch
+
+	if [ -z "$(pkginfo -i | grep '^geoclue ')" ]; then
+		local config='--disable-geolocation'
+	fi
+
+	./configure $config \
 		--prefix=/usr \
 		--enable-video \
 		--with-font-backend=freetype \
@@ -23,6 +31,8 @@ build() {
 
 	make -j 1
 	make DESTDIR=$PKG install
-	rm -r $PKG/usr/share/locale
-	rm -r $PKG/usr/share/gtk-doc
+
+	rm -r \
+		$PKG/usr/share/locale \
+		$PKG/usr/share/gtk-doc
 }

webkit/gtkdoc-rebase-remove.patch

@@ -0,0 +1,14 @@
+diff -ur webkit-1.8.1/Tools/gtk/generate-gtkdoc webkit-1.8.1-patched/Tools/gtk/generate-gtkdoc
+--- webkit-1.8.1/Tools/gtk/generate-gtkdoc	2012-04-22 19:27:07.000000000 -0400
++++ webkit-1.8.1-patched/Tools/gtk/generate-gtkdoc	2012-06-18 21:06:35.000000000 -0400
+@@ -142,8 +142,8 @@
+     if not os.path.isdir(options['output_dir']):
+         print "Documentation was not generated"
+         return
+-    generator = gtkdoc.PkgConfigGTKDoc(pkg_config_path, options)
+-    generator.rebase_installed_docs()
++    #generator = gtkdoc.PkgConfigGTKDoc(pkg_config_path, options)
++    #generator.rebase_installed_docs()
+ 
+ configure_logging()
+