Date: Friday, May 15, 2020 @ 23:21:04 Author: jgc Revision: 383742 archrelease: copy trunk to extra-x86_64
Added: zeitgeist/repos/extra-x86_64/PKGBUILD (from rev 383741, zeitgeist/trunk/PKGBUILD) zeitgeist/repos/extra-x86_64/ontology2code.patch (from rev 383741, zeitgeist/trunk/ontology2code.patch) zeitgeist/repos/extra-x86_64/zeitgeist-python3.patch (from rev 383741, zeitgeist/trunk/zeitgeist-python3.patch) Deleted: zeitgeist/repos/extra-x86_64/PKGBUILD zeitgeist/repos/extra-x86_64/zeitgeist-python3.patch -------------------------+ PKGBUILD | 109 +++++++------- ontology2code.patch | 31 ++++ zeitgeist-python3.patch | 338 +++++++++++++++++++++++----------------------- 3 files changed, 256 insertions(+), 222 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-15 23:21:01 UTC (rev 383741) +++ PKGBUILD 2020-05-15 23:21:04 UTC (rev 383742) @@ -1,53 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: György Balló <ball...@freestart.hu> - -pkgname=zeitgeist -pkgver=1.0.2 -pkgrel=4 -pkgdesc="Service logging user activities and events" -arch=(x86_64) -url="https://launchpad.net/zeitgeist/" -license=(GPL2 LGPL2.1) -depends=(json-glib telepathy-glib gtk3 xapian-core sqlite) -makedepends=(gobject-introspection vala raptor python-rdflib git) -provides=(zeitgeist-datahub) -conflicts=(zeitgeist-datahub) -replaces=(zeitgeist-datahub) -_commit=f6394278664b19210823d27e9c04d363f38bd33d # tags/v1.0.2^0 -source=("git+https://anongit.freedesktop.org/git/zeitgeist/zeitgeist#commit=$_commit" - zeitgeist-python3.patch) -sha256sums=('SKIP' - '69f7eb95e51cabef247296a92d753de654ffeeca8e111f58cbaa960d5e431e10') -validpgpkeys=('E4884AEEDE4CC02043C3D8045DECDBA89270E723') #Rico Tzschichholz <ric...@ubuntu.com> - -pkgver() { - cd $pkgname - git describe --tags | sed 's/^v//;s/-/+/g' -} - -prepare() { - cd $pkgname - - patch -p1 -i ../zeitgeist-python3.patch # Port to python3 - autoreconf -fi -} - -build() { - cd $pkgname - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --enable-fts - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -check() { - cd $pkgname - # Log test fails in chroot, as we have no X and no proper dbus - make -k check || : -} - -package() { - cd $pkgname - make DESTDIR="$pkgdir" install -} Copied: zeitgeist/repos/extra-x86_64/PKGBUILD (from rev 383741, zeitgeist/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-15 23:21:04 UTC (rev 383742) @@ -0,0 +1,56 @@ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: György Balló <ball...@freestart.hu> + +pkgname=zeitgeist +pkgver=1.0.2 +pkgrel=5 +pkgdesc="Service logging user activities and events" +arch=(x86_64) +url="https://launchpad.net/zeitgeist/" +license=(GPL2 LGPL2.1) +depends=(json-glib telepathy-glib gtk3 xapian-core sqlite) +makedepends=(gobject-introspection vala raptor python-rdflib git) +provides=(zeitgeist-datahub) +conflicts=(zeitgeist-datahub) +replaces=(zeitgeist-datahub) +_commit=f6394278664b19210823d27e9c04d363f38bd33d # tags/v1.0.2^0 +source=("git+https://anongit.freedesktop.org/git/zeitgeist/zeitgeist#commit=$_commit" + zeitgeist-python3.patch + ontology2code.patch) +sha256sums=('SKIP' + '69f7eb95e51cabef247296a92d753de654ffeeca8e111f58cbaa960d5e431e10' + '5242827ff26b0dcb151053a48e77e50931ac2beba131bfdabdfe9421c616862e') +validpgpkeys=('E4884AEEDE4CC02043C3D8045DECDBA89270E723') #Rico Tzschichholz <ric...@ubuntu.com> + +pkgver() { + cd $pkgname + git describe --tags | sed 's/^v//;s/-/+/g' +} + +prepare() { + cd $pkgname + + patch -p1 -i ../zeitgeist-python3.patch # Port to python3 + patch -p1 -i ../ontology2code.patch + autoreconf -fi +} + +build() { + cd $pkgname + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib --enable-fts + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +check() { + cd $pkgname + # Log test fails in chroot, as we have no X and no proper dbus + make -k check || : +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} Copied: zeitgeist/repos/extra-x86_64/ontology2code.patch (from rev 383741, zeitgeist/trunk/ontology2code.patch) =================================================================== --- ontology2code.patch (rev 0) +++ ontology2code.patch 2020-05-15 23:21:04 UTC (rev 383742) @@ -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() + Deleted: zeitgeist-python3.patch =================================================================== --- zeitgeist-python3.patch 2020-05-15 23:21:01 UTC (rev 383741) +++ zeitgeist-python3.patch 2020-05-15 23:21:04 UTC (rev 383742) @@ -1,169 +0,0 @@ -diff --git a/python/client.py b/python/client.py -index 7efdd2d7..2d7c9adb 100644 ---- a/python/client.py -+++ b/python/client.py -@@ -118,7 +118,7 @@ class _DBusInterface(object): - - try: - return method_getter()(*args, **kwargs) -- except dbus.exceptions.DBusException, e: -+ except dbus.exceptions.DBusException as e: - return reconnecting_error_handler(e) - - def __getattr__(self, name): -@@ -258,7 +258,7 @@ class ZeitgeistDBusInterface(object): - try: - proxy = get_bus().get_object(self.BUS_NAME, - self.OBJECT_PATH, follow_name_owner_changes=True) -- except dbus.exceptions.DBusException, e: -+ except dbus.exceptions.DBusException as e: - if e.get_dbus_name() == "org.freedesktop.DBus.Error.ServiceUnknown": - raise RuntimeError( - "Found no running zeitgeist-daemon instance: %s" % \ -@@ -1054,11 +1054,11 @@ class ZeitgeistClient: - """ - - if unique_id not in self._data_sources: -- raise ValueError, 'set_data_source_enabled_callback() called before ' \ -- 'register_data_source()' -+ raise ValueError('set_data_source_enabled_callback() called before ' \ -+ 'register_data_source()') - - if not callable(enabled_callback): -- raise TypeError, 'enabled_callback: expected a callable method' -+ raise TypeError('enabled_callback: expected a callable method') - - self._data_sources[unique_id]['callback'] = enabled_callback - -diff --git a/python/datamodel.py b/python/datamodel.py -index d8402bd4..fe436eaa 100644 ---- a/python/datamodel.py -+++ b/python/datamodel.py -@@ -26,7 +26,7 @@ import os.path - import gettext - import time - import sys --gettext.install("zeitgeist", unicode=1) -+gettext.install("zeitgeist") - - __all__ = [ - 'Interpretation', -@@ -121,12 +121,12 @@ class Symbol(str): - def _ensure_all_children (self): - if self._all_children is not None : return - self._all_children = dict() -- for child in self._children.itervalues(): -+ for child in self._children.values(): - child._visit(self._all_children) - - def _visit (self, dikt): - dikt[self.name] = self -- for child in self._children.itervalues(): -+ for child in self._children.values(): - child._visit(dikt) - - @staticmethod -@@ -141,7 +141,7 @@ class Symbol(str): - children = list(symbol.get_all_children()) - children.append(uri) - return children -- except KeyError, e: -+ except KeyError as e: - return [uri] - - -@@ -174,7 +174,7 @@ class Symbol(str): - """ - Returns a list of immediate child symbols - """ -- return frozenset(self._children.itervalues()) -+ return frozenset(self._children.values()) - - def iter_all_children(self): - """ -@@ -182,7 +182,7 @@ class Symbol(str): - of this symbol - """ - self._ensure_all_children() -- return self._all_children.itervalues() -+ return self._all_children.values() - - def get_all_children(self): - """ -@@ -194,7 +194,7 @@ class Symbol(str): - """ - Returns a list of immediate parent symbols - """ -- return frozenset(self._parents.itervalues()) -+ return frozenset(self._parents.values()) - - def is_child_of (self, parent): - """ -@@ -203,7 +203,7 @@ class Symbol(str): - if not isinstance (parent, Symbol): - try: - parent = _SYMBOLS_BY_URI[parent] -- except KeyError, e: -+ except KeyError as e: - # Parent is not a known URI - return self.uri == parent - -@@ -226,7 +226,7 @@ class Symbol(str): - if isinstance (child, basestring): - try: - child = _SYMBOLS_BY_URI[child] -- except KeyError, e: -+ except KeyError as e: - # Child is not a know URI - if isinstance (parent, basestring): - return child == parent -@@ -1170,7 +1170,7 @@ _SYMBOLS_BY_URI["Manifestation"] = Manifestation - # Load the ontology definitions - ontology_file = os.path.join(os.path.dirname(__file__), "_ontology.py") - try: -- execfile(ontology_file) -+ exec(open(ontology_file).read()) - except IOError: - raise ImportError("Unable to load Zeitgeist ontology. Did you run `make`?") - -@@ -1178,23 +1178,23 @@ except IOError: - # Bootstrap the symbol relations. We use a 2-pass strategy: - # - # 1) Make sure that all parents and children are registered on each symbol --for symbol in _SYMBOLS_BY_URI.itervalues(): -+for symbol in _SYMBOLS_BY_URI.values(): - for parent in symbol._parents: - try: - _SYMBOLS_BY_URI[parent]._children[symbol.uri] = None -- except KeyError, e: -- print "ERROR", e, parent, symbol.uri -+ except KeyError as e: -+ print ("ERROR", e, parent, symbol.uri) - pass - for child in symbol._children: - try: - _SYMBOLS_BY_URI[child]._parents.add(symbol.uri) - except KeyError: -- print "ERROR", e, child, symbol.uri -+ print ("ERROR", e, child, symbol.uri) - pass - - # 2) Resolve all child and parent URIs to their actual Symbol instances --for symbol in _SYMBOLS_BY_URI.itervalues(): -- for child_uri in symbol._children.iterkeys(): -+for symbol in _SYMBOLS_BY_URI.values(): -+ for child_uri in symbol._children.keys(): - symbol._children[child_uri] = _SYMBOLS_BY_URI[child_uri] - - parents = {} -@@ -1204,8 +1204,8 @@ for symbol in _SYMBOLS_BY_URI.itervalues(): - - - if __name__ == "__main__": -- print "Success" -+ print ("Success") - end_symbols = time.time() -- print >> sys.stderr, "Import time: %s" % (end_symbols - start_symbols) -+ print ("Import time: %s" % (end_symbols - start_symbols), sys.stderr) - - # vim:noexpandtab:ts=4:sw=4 Copied: zeitgeist/repos/extra-x86_64/zeitgeist-python3.patch (from rev 383741, zeitgeist/trunk/zeitgeist-python3.patch) =================================================================== --- zeitgeist-python3.patch (rev 0) +++ zeitgeist-python3.patch 2020-05-15 23:21:04 UTC (rev 383742) @@ -0,0 +1,169 @@ +diff --git a/python/client.py b/python/client.py +index 7efdd2d7..2d7c9adb 100644 +--- a/python/client.py ++++ b/python/client.py +@@ -118,7 +118,7 @@ class _DBusInterface(object): + + try: + return method_getter()(*args, **kwargs) +- except dbus.exceptions.DBusException, e: ++ except dbus.exceptions.DBusException as e: + return reconnecting_error_handler(e) + + def __getattr__(self, name): +@@ -258,7 +258,7 @@ class ZeitgeistDBusInterface(object): + try: + proxy = get_bus().get_object(self.BUS_NAME, + self.OBJECT_PATH, follow_name_owner_changes=True) +- except dbus.exceptions.DBusException, e: ++ except dbus.exceptions.DBusException as e: + if e.get_dbus_name() == "org.freedesktop.DBus.Error.ServiceUnknown": + raise RuntimeError( + "Found no running zeitgeist-daemon instance: %s" % \ +@@ -1054,11 +1054,11 @@ class ZeitgeistClient: + """ + + if unique_id not in self._data_sources: +- raise ValueError, 'set_data_source_enabled_callback() called before ' \ +- 'register_data_source()' ++ raise ValueError('set_data_source_enabled_callback() called before ' \ ++ 'register_data_source()') + + if not callable(enabled_callback): +- raise TypeError, 'enabled_callback: expected a callable method' ++ raise TypeError('enabled_callback: expected a callable method') + + self._data_sources[unique_id]['callback'] = enabled_callback + +diff --git a/python/datamodel.py b/python/datamodel.py +index d8402bd4..fe436eaa 100644 +--- a/python/datamodel.py ++++ b/python/datamodel.py +@@ -26,7 +26,7 @@ import os.path + import gettext + import time + import sys +-gettext.install("zeitgeist", unicode=1) ++gettext.install("zeitgeist") + + __all__ = [ + 'Interpretation', +@@ -121,12 +121,12 @@ class Symbol(str): + def _ensure_all_children (self): + if self._all_children is not None : return + self._all_children = dict() +- for child in self._children.itervalues(): ++ for child in self._children.values(): + child._visit(self._all_children) + + def _visit (self, dikt): + dikt[self.name] = self +- for child in self._children.itervalues(): ++ for child in self._children.values(): + child._visit(dikt) + + @staticmethod +@@ -141,7 +141,7 @@ class Symbol(str): + children = list(symbol.get_all_children()) + children.append(uri) + return children +- except KeyError, e: ++ except KeyError as e: + return [uri] + + +@@ -174,7 +174,7 @@ class Symbol(str): + """ + Returns a list of immediate child symbols + """ +- return frozenset(self._children.itervalues()) ++ return frozenset(self._children.values()) + + def iter_all_children(self): + """ +@@ -182,7 +182,7 @@ class Symbol(str): + of this symbol + """ + self._ensure_all_children() +- return self._all_children.itervalues() ++ return self._all_children.values() + + def get_all_children(self): + """ +@@ -194,7 +194,7 @@ class Symbol(str): + """ + Returns a list of immediate parent symbols + """ +- return frozenset(self._parents.itervalues()) ++ return frozenset(self._parents.values()) + + def is_child_of (self, parent): + """ +@@ -203,7 +203,7 @@ class Symbol(str): + if not isinstance (parent, Symbol): + try: + parent = _SYMBOLS_BY_URI[parent] +- except KeyError, e: ++ except KeyError as e: + # Parent is not a known URI + return self.uri == parent + +@@ -226,7 +226,7 @@ class Symbol(str): + if isinstance (child, basestring): + try: + child = _SYMBOLS_BY_URI[child] +- except KeyError, e: ++ except KeyError as e: + # Child is not a know URI + if isinstance (parent, basestring): + return child == parent +@@ -1170,7 +1170,7 @@ _SYMBOLS_BY_URI["Manifestation"] = Manifestation + # Load the ontology definitions + ontology_file = os.path.join(os.path.dirname(__file__), "_ontology.py") + try: +- execfile(ontology_file) ++ exec(open(ontology_file).read()) + except IOError: + raise ImportError("Unable to load Zeitgeist ontology. Did you run `make`?") + +@@ -1178,23 +1178,23 @@ except IOError: + # Bootstrap the symbol relations. We use a 2-pass strategy: + # + # 1) Make sure that all parents and children are registered on each symbol +-for symbol in _SYMBOLS_BY_URI.itervalues(): ++for symbol in _SYMBOLS_BY_URI.values(): + for parent in symbol._parents: + try: + _SYMBOLS_BY_URI[parent]._children[symbol.uri] = None +- except KeyError, e: +- print "ERROR", e, parent, symbol.uri ++ except KeyError as e: ++ print ("ERROR", e, parent, symbol.uri) + pass + for child in symbol._children: + try: + _SYMBOLS_BY_URI[child]._parents.add(symbol.uri) + except KeyError: +- print "ERROR", e, child, symbol.uri ++ print ("ERROR", e, child, symbol.uri) + pass + + # 2) Resolve all child and parent URIs to their actual Symbol instances +-for symbol in _SYMBOLS_BY_URI.itervalues(): +- for child_uri in symbol._children.iterkeys(): ++for symbol in _SYMBOLS_BY_URI.values(): ++ for child_uri in symbol._children.keys(): + symbol._children[child_uri] = _SYMBOLS_BY_URI[child_uri] + + parents = {} +@@ -1204,8 +1204,8 @@ for symbol in _SYMBOLS_BY_URI.itervalues(): + + + if __name__ == "__main__": +- print "Success" ++ print ("Success") + end_symbols = time.time() +- print >> sys.stderr, "Import time: %s" % (end_symbols - start_symbols) ++ print ("Import time: %s" % (end_symbols - start_symbols), sys.stderr) + + # vim:noexpandtab:ts=4:sw=4