Date: Friday, May 15, 2020 @ 23:21:01 Author: jgc Revision: 383741 upgpkg: zeitgeist 1.0.2-5: Fix ontology2code to dump python symbols (FS#62572)
Added: zeitgeist/trunk/ontology2code.patch Modified: zeitgeist/trunk/PKGBUILD ---------------------+ PKGBUILD | 9 ++++++--- ontology2code.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-15 22:11:42 UTC (rev 383740) +++ PKGBUILD 2020-05-15 23:21:01 UTC (rev 383741) @@ -4,7 +4,7 @@ pkgname=zeitgeist pkgver=1.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Service logging user activities and events" arch=(x86_64) url="https://launchpad.net/zeitgeist/"; @@ -16,9 +16,11 @@ replaces=(zeitgeist-datahub) _commit=f6394278664b19210823d27e9c04d363f38bd33d # tags/v1.0.2^0 source=("git+https://anongit.freedesktop.org/git/zeitgeist/zeitgeist#commit=$_commit"; - zeitgeist-python3.patch) + zeitgeist-python3.patch + ontology2code.patch) sha256sums=('SKIP' - '69f7eb95e51cabef247296a92d753de654ffeeca8e111f58cbaa960d5e431e10') + '69f7eb95e51cabef247296a92d753de654ffeeca8e111f58cbaa960d5e431e10' + '5242827ff26b0dcb151053a48e77e50931ac2beba131bfdabdfe9421c616862e') validpgpkeys=('E4884AEEDE4CC02043C3D8045DECDBA89270E723') #Rico Tzschichholz <ric...@ubuntu.com> pkgver() { @@ -30,6 +32,7 @@ cd $pkgname patch -p1 -i ../zeitgeist-python3.patch # Port to python3 + patch -p1 -i ../ontology2code.patch autoreconf -fi } Added: ontology2code.patch =================================================================== --- ontology2code.patch (rev 0) +++ ontology2code.patch 2020-05-15 23:21:01 UTC (rev 383741) @@ -0,0 +1,31 @@ +diff --git a/data/ontology2code b/data/ontology2code +index 63af897d..b05f7412 100755 +--- a/data/ontology2code ++++ b/data/ontology2code +@@ -195,7 +195,7 @@ class Utils: + def replace_items(item_set, item_map): + if not item_set: + return +- for item, value in item_map.iteritems(): ++ for item, value in item_map.items(): + try: + item_set.remove(item) + except KeyError: +@@ -277,7 +277,7 @@ class GenericSerializer: + class PythonSerializer(GenericSerializer): + + def dump(self): +- for symbol in sorted(self.symbols.itervalues()): ++ for symbol in sorted(self.symbols.values()): + parents = set((symbol.uri for symbol in symbol.parents)) + Utils.replace_items(parents, { + str(NIENS['InformationElement']): 'Interpretation', +@@ -435,7 +435,7 @@ class OntologyCodeGenerator: + if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument('--vala', nargs=4, metavar=('URI_TEMPLATE', 'SYMBOLS_TEMPLATE', 'URI_DESTINATION', 'SYMBOLS_DESTINATION')) +- parser.add_argument('--dump-python', action='store_false') ++ parser.add_argument('--dump-python', action='store_true') + + args = parser.parse_args() +
