Patch out the check for zeitgeist to avoid midori picking it up if present.

This commit is contained in:
landry 2012-10-22 21:18:59 +00:00
parent ab1538fe6d
commit 08cd911ea2

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-wscript,v 1.23 2012/09/26 17:44:56 landry Exp $ $OpenBSD: patch-wscript,v 1.24 2012/10/22 21:18:59 landry Exp $
Fix paths to config files. Fix paths to config files.
--- wscript.orig Wed Sep 19 23:17:43 2012 --- wscript.orig Wed Sep 19 23:17:43 2012
+++ wscript Wed Sep 26 18:32:03 2012 +++ wscript Mon Oct 22 23:15:43 2012
@@ -73,7 +73,7 @@ def rc_file(self, node): @@ -73,7 +73,7 @@ def rc_file(self, node):
self.compiled_tasks.append (rctask) self.compiled_tasks.append (rctask)
rc_file = extension ('.rc')(rc_file) rc_file = extension ('.rc')(rc_file)
@ -13,7 +13,15 @@ Fix paths to config files.
def configure (conf): def configure (conf):
def option_checkfatal (option, desc): def option_checkfatal (option, desc):
@@ -485,7 +485,7 @@ def build (bld): @@ -237,7 +237,6 @@ def configure (conf):
granite = 'no '
conf.define ('GRANITE_VERSION', 'No')
- check_pkg ('zeitgeist-1.0', '0.3.14', mandatory=False)
conf.check (lib='m', mandatory=True)
check_pkg ('gmodule-2.0', '2.8.0', False)
check_pkg ('gthread-2.0', '2.8.0', False)
@@ -485,7 +484,7 @@ def build (bld):
'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css') 'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css')
# Install default configuration # Install default configuration
@ -22,7 +30,7 @@ Fix paths to config files.
if bld.env['INTLTOOL']: if bld.env['INTLTOOL']:
obj = bld.new_task_gen ('intltool_po') obj = bld.new_task_gen ('intltool_po')
@@ -554,7 +554,7 @@ def build (bld): @@ -554,7 +553,7 @@ def build (bld):
for extension in extensions: for extension in extensions:
source = 'data/extensions/' + extension + '/config' source = 'data/extensions/' + extension + '/config'
if os.path.exists (source): if os.path.exists (source):