diff --git a/desktop/misc/diodon/actions.py b/desktop/misc/diodon/actions.py index cf8b59a015..45fed2719f 100644 --- a/desktop/misc/diodon/actions.py +++ b/desktop/misc/diodon/actions.py @@ -7,12 +7,12 @@ from pisi.actionsapi import mesontools, pisitools def setup(): - mesontools.configure() + mesontools.configure() def build(): - mesontools.build() + mesontools.build() def install(): - mesontools.install() + mesontools.install() - pisitools.dodoc("AUTHORS") + pisitools.dodoc("AUTHORS", "COPYING") diff --git a/desktop/misc/diodon/pspec.xml b/desktop/misc/diodon/pspec.xml index d836daa11f..dded816c09 100644 --- a/desktop/misc/diodon/pspec.xml +++ b/desktop/misc/diodon/pspec.xml @@ -1,95 +1,101 @@ - - diodon - https://github.com/diodon-dev/diodon - - PisiLinux Community - admins@pisilinux.org - - GPL-2 - app:gui - desktop.misc - Clipboard manager. - Aiming to be the best integrated clipboard manager for the Unity desktop. - - https://launchpad.net/diodon/trunk/1.13.0/+download/diodon-1.13.0.tar.xz - - - cmake - meson - gtk3-devel - vala-devel - glib2-devel - libpeas-devel - libxslt-devel - zeitgeist-devel - libpeas-1-devel - xorg-server-xvfb - desktop-file-utils - ayatana-libappindicator-devel - - + + diodon + https://github.com/diodon-dev/diodon + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:gui + desktop.misc + Clipboard manager. + Aiming to be the best integrated clipboard manager for the Unity desktop. + https://launchpad.net/diodon/trunk/1.13.0/+download/diodon-1.13.0.tar.xz + + meson + gtk3-devel + vala-devel + glib2-devel + libX11-devel + libxslt-devel + libXtst-devel + zeitgeist-devel + libpeas-1-devel + xorg-server-xvfb + desktop-file-utils + gobject-introspection-devel + ayatana-libappindicator-devel + + + + + - - diodon - - gtk3 - glib2 - libX11 - libXtst - libpeas - zeitgeist - gdk-pixbuf - ayatana-libappindicator - - - /etc/xdg - /etc/apport - /usr/bin - /usr/lib - /usr/share - /usr/share/locale - /usr/share/man - - + + diodon + + gtk3 + libX11 + libXtst + libpeas-1 + zeitgeist + gdk-pixbuf + gobject-introspection + ayatana-libappindicator + + + /etc + /usr/bin + /usr/lib + /usr/share + + - - diodon-devel - - diodon - glib2-devel - gtk3-devel - - - /usr/lib/pkgconfig - /usr/include - - + + diodon-devel + + diodon + glib2-devel + gtk3-devel + + + /usr/lib/pkgconfig + /usr/include + + - - - 2022-08-07 - 1.13.0 - Version bump. - fury - uglyside@yandex.ru - - - 2022-06-10 - 1.12.0 - Version bump. - fury - uglyside@yandex.ru - - - 2021-10-13 - 1.11.1 - First build - fury - uglyside@yandex.ru - - + + + 2025-06-15 + 1.13.0 + Rebuild. + PisiLinux Community + admins@pisilinux.org + + + 2022-08-07 + 1.13.0 + Version bump. + fury + uglyside@yandex.ru + + + 2022-06-10 + 1.12.0 + Version bump. + fury + uglyside@yandex.ru + + + 2021-10-13 + 1.11.1 + First build + fury + uglyside@yandex.ru + + diff --git a/util/admin/zeitgeist/actions.py b/util/admin/zeitgeist/actions.py index 06a056ad70..3f72174248 100644 --- a/util/admin/zeitgeist/actions.py +++ b/util/admin/zeitgeist/actions.py @@ -4,16 +4,16 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import shelltools, autotools, pisitools, get +from pisi.actionsapi import shelltools, autotools, get def setup(): - shelltools.system("NOCONFIGURE=1 ./autogen.sh") - autotools.configure("--enable-fts") + shelltools.system("NOCONFIGURE=1 ./autogen.sh") + autotools.configure("--enable-fts --enable-datahub") def build(): - autotools.make() + autotools.make() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.removeDir("/usr/lib/systemd") + data = "nodist_systemd_user_DATA = ''" + doc = "zeitgeistdoc_DATA = 'AUTHORS COPYING MAINTAINERS NEWS'" + autotools.rawInstall("DESTDIR=%s %s %s" % (get.installDIR(), data, doc)) diff --git a/util/admin/zeitgeist/files/Fix_wrong_parameter_for_Event.full()_ctor.patch b/util/admin/zeitgeist/files/Fix_wrong_parameter_for_Event.full()_ctor.patch new file mode 100644 index 0000000000..356bc23103 --- /dev/null +++ b/util/admin/zeitgeist/files/Fix_wrong_parameter_for_Event.full()_ctor.patch @@ -0,0 +1,39 @@ +From 1be2a5fff77cdf61c843edc8356dfdef3fd2dbfc Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Fri, 9 Sep 2022 14:49:27 +0200 +Subject: [PATCH] datahub: Fix wrong parameter for Event.full() ctor + +Thanks to Mamoru TASAKA + +Fixes https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/19 +--- + datahub/telepathy-observer.vala | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/datahub/telepathy-observer.vala b/datahub/telepathy-observer.vala +index cd670d06..bb34581c 100644 +--- a/datahub/telepathy-observer.vala ++++ b/datahub/telepathy-observer.vala +@@ -96,8 +96,7 @@ public class TelepathyObserver : DataProvider + ZG.ACCESS_EVENT, + "", + actor, +- null, +- obj_path); ++ null, null); + + /* + * Whether user initiated the chat or not +@@ -217,8 +216,7 @@ public class TelepathyObserver : DataProvider + ZG.ACCESS_EVENT, + ZG.USER_ACTIVITY, + actor, +- null, +- obj_path); ++ null, null); + if (!channel.requested) + event_template.manifestation = ZG.WORLD_ACTIVITY; + /* +-- +GitLab + diff --git a/util/admin/zeitgeist/files/Replace_getargspec_with_getfullargspec.patch b/util/admin/zeitgeist/files/Replace_getargspec_with_getfullargspec.patch new file mode 100644 index 0000000000..5500cfe755 --- /dev/null +++ b/util/admin/zeitgeist/files/Replace_getargspec_with_getfullargspec.patch @@ -0,0 +1,27 @@ +From 33ab4cce74857f928382ba6cfada111a64dafe88 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Wed, 11 Jan 2023 11:01:45 +0100 +Subject: [PATCH] python: Replace getargspec with getfullargspec + +Fixes https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/26 +--- + python/client.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/python/client.py b/python/client.py +index 39b2fb0a..25d81c53 100644 +--- a/python/client.py ++++ b/python/client.py +@@ -1097,7 +1097,7 @@ class ZeitgeistClient(object): + if callable(normal_reply_handler): + normal_reply_handler(normal_reply_data) + +-_FIND_EVENTS_FOR_TEMPLATES_ARGS = inspect.getargspec( +- ZeitgeistClient.find_events_for_templates)[0] ++_FIND_EVENTS_FOR_TEMPLATES_ARGS = inspect.getfullargspec( ++ ZeitgeistClient.find_events_for_templates).args + + # vim:noexpandtab:ts=4:sw=4 +-- +GitLab + diff --git a/util/admin/zeitgeist/files/Use_GenericArray_API_only.patch b/util/admin/zeitgeist/files/Use_GenericArray_API_only.patch deleted file mode 100644 index 76cdcc4723..0000000000 --- a/util/admin/zeitgeist/files/Use_GenericArray_API_only.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 64ac3a6f94cd299e5e14945dc31b48f009dec152 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 30 Dec 2020 16:50:32 +0100 -Subject: [PATCH] Use GenericArray API only - ---- - libzeitgeist/where-clause.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala -index 204e9b1a..c3e6fa62 100644 ---- a/libzeitgeist/where-clause.vala -+++ b/libzeitgeist/where-clause.vala -@@ -216,7 +216,7 @@ namespace Zeitgeist - #else - long[] pointers = new long[gptrarr.length + 1]; - #endif -- Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata, -+ Memory.copy(pointers, (void*) gptrarr.data, - gptrarr.length * sizeof (void *)); - return (T[]) pointers; - } --- -GitLab - diff --git a/util/admin/zeitgeist/pspec.xml b/util/admin/zeitgeist/pspec.xml index de6488aa59..dc8b2b0650 100644 --- a/util/admin/zeitgeist/pspec.xml +++ b/util/admin/zeitgeist/pspec.xml @@ -1,106 +1,111 @@ - - zeitgeist - https://zeitgeist.freedesktop.org/ - - PisiLinux Community - admins@pisilinux.org - - LGPL-2.1 - library - util.admin - Activity logging framework. - Zeitgeist is a service which logs the users's activities and events (files opened, websites visites, conversations held with other people, etc.) and makes relevant information available to other applications. - - https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/archive/v1.0.4/zeitgeist-v1.0.4.tar.bz2 - - - dbus-devel - gtk3-devel - vala-devel - glib2-devel - sqlite-devel - python3-six - python3-devel - python3-rdflib - python3-isodate - json-glib-devel - python3-pyparsing - xapian-core-devel - telepathy-glib-devel - gobject-introspection-devel - - - - - + + zeitgeist + https://zeitgeist.freedesktop.org/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + util.admin + Activity logging framework. + Zeitgeist is a service which logs the users's activities and events and makes relevant information available to other applications. + https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/archive/v1.0.4/zeitgeist-v1.0.4.tar.bz2 + + dbus-devel + gtk3-devel + vala-devel + glib2-devel + python3-six + sqlite-devel + python3-devel + python3-rdflib + python3-isodate + json-glib-devel + python3-pyparsing + xapian-core-devel + telepathy-glib-devel + gobject-introspection-devel + + + + Fix_wrong_parameter_for_Event.full()_ctor.patch + Replace_getargspec_with_getfullargspec.patch + + - - zeitgeist - - gtk3 - glib2 - sqlite - libgcc - python3 - json-glib - xapian-core - dbus-python3 - telepathy-glib - - - /etc/xdg - /usr/bin - /usr/libexec/zeitgeist/zeitgeist-fts - /usr/lib - /usr/share - /usr/share/man - - + + zeitgeist + + gtk3 + glib2 + sqlite + libgcc + python3 + json-glib + xapian-core + dbus-python3 + telepathy-glib + + + /etc + /usr/bin + /usr/libexec + /usr/lib + /usr/share + + - - zeitgeist-devel - - zeitgeist - glib2-devel - - - /usr/include - /usr/lib/pkgconfig - - + + zeitgeist-devel + + zeitgeist + glib2-devel + + + /usr/include + /usr/lib/pkgconfig + + - - - 2023-11-04 - 1.0.4 - Rebuild. - fury - uglyside@yandex.ru - - - 2022-12-28 - 1.0.4 - Rebuild. - fury - uglyside@yandex.ru - - - 2022-01-18 - 1.0.4 - Version bump - fury - uglyside@yandex.ru - - - 2021-10-13 - 1.0.3 - First build - fury - uglyside@yandex.ru - - + + + 2025-06-15 + 1.0.4 + Rebuild. + PisiLinux Community + admins@pisilinux.org + + + 2023-11-04 + 1.0.4 + Rebuild. + fury + uglyside@yandex.ru + + + 2022-12-28 + 1.0.4 + Rebuild. + fury + uglyside@yandex.ru + + + 2022-01-18 + 1.0.4 + Version bump + fury + uglyside@yandex.ru + + + 2021-10-13 + 1.0.3 + First build + fury + uglyside@yandex.ru + +