Martin Wilck
a782129e62
- Update to version 3.0.1: * remove binary waf footer * mark org.gnome.Hamster.GUI as experimental * restore edit method in WindowServer * add edit action in cli * appdata: Rename to org.gnome.Hamster * explicitly set application ID and prgname on startup * Fix completion in categories TreeView * Fix search function (#551) * metainfo file renamed to org.gnome.Hamster.GUI.metainfo.xml - Use --skip-icon-cache-update option during build - Dropped / renamed patches * Drop patch: wscript-don-t-update-icon-cache.patch (obsolete) * Drop patch: Fix-search-function-551.patch (merged upstream) * Drop patch: hamster-explicitly-set-application-ID-and-prgname-on.patch (merged upstream) * Drop patch: Revert-remove-unused-edit-method.patch (rejected upstream) * Rename patch: env-script-interpreter.patch -> replace-env-python-invocation-by-direct-call.patch * Removed appdata.patch in OBS - Added upstram bug-fix PR #580 ("Fix handling of datetime arguments to from_start_end") * Add patch: fix-from_start_end-handle-datetime-first.patch * Add patch: choke-on-invalid-types-in-from_start_end.patch - Added merged upstream PR #584 ("Use itstool instead of xml2po") * Add patch: Use-itstool-instead-of-xml2po.patch (i18n fixes) * Add patch: fixup-Use-itstool-instead-of-xml2po.patch OBS-URL: https://build.opensuse.org/request/show/785399 OBS-URL: https://build.opensuse.org/package/show/Office/hamster-time-tracker?expand=0&rev=7
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From d60ae5a815cbd0c7cb313d7a2b2960b852d3cfb0 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Tue, 11 Feb 2020 17:28:05 +0100
|
|
Subject: [PATCH] waf: skip gsettings schema compilation
|
|
|
|
---
|
|
waflib/Tools/glib2.py | 15 ---------------
|
|
1 file changed, 15 deletions(-)
|
|
|
|
diff --git a/waflib/Tools/glib2.py b/waflib/Tools/glib2.py
|
|
index 949fe37..2aca61e 100644
|
|
--- a/waflib/Tools/glib2.py
|
|
+++ b/waflib/Tools/glib2.py
|
|
@@ -301,20 +301,6 @@ def process_settings(self):
|
|
schema_task.set_outputs (target_node)
|
|
schema_task.env.GLIB_VALIDATE_SCHEMA_OUTPUT = target_node.abspath()
|
|
|
|
- # 3. schemas install task
|
|
- def compile_schemas_callback(bld):
|
|
- if not bld.is_install:
|
|
- return
|
|
- compile_schemas = Utils.to_list(bld.env.GLIB_COMPILE_SCHEMAS)
|
|
- destdir = Options.options.destdir
|
|
- paths = bld._compile_schemas_registered
|
|
- if destdir:
|
|
- paths = (os.path.join(destdir, path.lstrip(os.sep)) for path in paths)
|
|
- for path in paths:
|
|
- Logs.pprint('YELLOW', 'Updating GSettings schema cache %r' % path)
|
|
- if self.bld.exec_command(compile_schemas + [path]):
|
|
- Logs.warn('Could not update GSettings schema cache %r' % path)
|
|
-
|
|
if self.bld.is_install:
|
|
schemadir = self.env.GSETTINGSSCHEMADIR
|
|
if not schemadir:
|
|
@@ -325,7 +311,6 @@ def process_settings(self):
|
|
registered_schemas = getattr(self.bld, '_compile_schemas_registered', None)
|
|
if not registered_schemas:
|
|
registered_schemas = self.bld._compile_schemas_registered = set()
|
|
- self.bld.add_post_fun(compile_schemas_callback)
|
|
registered_schemas.add(schemadir)
|
|
|
|
class glib_validate_schema(Task.Task):
|
|
--
|
|
2.25.1
|
|
|