Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16828 from mrSi-Si/diodon

Browse Source 
zeitgeist, diodon rebuild.
This commit is contained in:
Kamil ATLI
2025-06-20 14:26:12 +03:00
committed by GitHub
parent dbecd48cb0 2fc061a5fa
commit c96aa17920
7 changed files with 273 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/misc/diodon/actions.py
+4 -4
View File
@@ -7,12 +7,12 @@
from pisi.actionsapi import mesontools, pisitools from pisi.actionsapi import mesontools, pisitools
def setup(): def setup():
mesontools.configure() mesontools.configure()
def build(): def build():
mesontools.build() mesontools.build()
def install(): def install():
mesontools.install() mesontools.install()
pisitools.dodoc("AUTHORS") pisitools.dodoc("AUTHORS", "COPYING")
desktop/misc/diodon/pspec.xml
+93 -87
View File
@@ -1,95 +1,101 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>diodon</Name> <Name>diodon</Name>
<Homepage>https://github.com/diodon-dev/diodon</Homepage> <Homepage>https://github.com/diodon-dev/diodon</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<License>GPL-2</License> <License>GPLv2</License>
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<PartOf>desktop.misc</PartOf> <PartOf>desktop.misc</PartOf>
<Summary>Clipboard manager.</Summary> <Summary>Clipboard manager.</Summary>
<Description>Aiming to be the best integrated clipboard manager for the Unity desktop.</Description> <Description>Aiming to be the best integrated clipboard manager for the Unity desktop.</Description>
<Archive sha1sum="768c5a10062059a0e7cd73d5e000c935ba63eebd" type="tarxz"> <Archive sha1sum="768c5a10062059a0e7cd73d5e000c935ba63eebd" type="tarxz">https://launchpad.net/diodon/trunk/1.13.0/+download/diodon-1.13.0.tar.xz</Archive>
https://launchpad.net/diodon/trunk/1.13.0/+download/diodon-1.13.0.tar.xz <BuildDependencies>
</Archive> <Dependency>meson</Dependency>
<BuildDependencies> <Dependency>gtk3-devel</Dependency>
<Dependency>cmake</Dependency> <Dependency>vala-devel</Dependency>
<Dependency>meson</Dependency> <Dependency>glib2-devel</Dependency>
<Dependency>gtk3-devel</Dependency> <Dependency>libX11-devel</Dependency>
<Dependency>vala-devel</Dependency> <Dependency>libxslt-devel</Dependency>
<Dependency>glib2-devel</Dependency> <Dependency>libXtst-devel</Dependency>
<Dependency>libpeas-devel</Dependency> <Dependency>zeitgeist-devel</Dependency>
<Dependency>libxslt-devel</Dependency> <Dependency>libpeas-1-devel</Dependency>
<Dependency>zeitgeist-devel</Dependency> <Dependency>xorg-server-xvfb</Dependency>
<Dependency>libpeas-1-devel</Dependency> <Dependency>desktop-file-utils</Dependency>
<Dependency>xorg-server-xvfb</Dependency> <Dependency>gobject-introspection-devel</Dependency>
<Dependency>desktop-file-utils</Dependency> <Dependency>ayatana-libappindicator-devel</Dependency>
<Dependency>ayatana-libappindicator-devel</Dependency> </BuildDependencies>
</BuildDependencies> <Patches>
</Source> <!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
<Package> <Package>
<Name>diodon</Name> <Name>diodon</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>gtk3</Dependency> <Dependency>gtk3</Dependency>
<Dependency>glib2</Dependency> <Dependency>libX11</Dependency>
<Dependency>libX11</Dependency> <Dependency>libXtst</Dependency>
<Dependency>libXtst</Dependency> <Dependency>libpeas-1</Dependency>
<Dependency>libpeas</Dependency> <Dependency>zeitgeist</Dependency>
<Dependency>zeitgeist</Dependency> <Dependency>gdk-pixbuf</Dependency>
<Dependency>gdk-pixbuf</Dependency> <Dependency>gobject-introspection</Dependency>
<Dependency>ayatana-libappindicator</Dependency> <Dependency>ayatana-libappindicator</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="config">/etc/xdg</Path> <Path fileType="config">/etc</Path>
<Path fileType="config">/etc/apport</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/bin</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="library">/usr/lib</Path> <Path fileType="data">/usr/share</Path>
<Path fileType="data">/usr/share</Path> </Files>
<Path fileType="localedata">/usr/share/locale</Path> </Package>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package> <Package>
<Name>diodon-devel</Name> <Name>diodon-devel</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release='current'>diodon</Dependency> <Dependency release='current'>diodon</Dependency>
<Dependency>glib2-devel</Dependency> <Dependency>glib2-devel</Dependency>
<Dependency>gtk3-devel</Dependency> <Dependency>gtk3-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/pkgconfig</Path> <Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="3"> <Update release="4">
<Date>2022-08-07</Date> <Date>2025-06-15</Date>
<Version>1.13.0</Version> <Version>1.13.0</Version>
<Comment>Version bump.</Comment> <Comment>Rebuild.</Comment>
<Name>fury</Name> <Name>PisiLinux Community</Name>
<Email>uglyside@yandex.ru</Email> <Email>admins@pisilinux.org</Email>
</Update> </Update>
<Update release="2"> <Update release="3">
<Date>2022-06-10</Date> <Date>2022-08-07</Date>
<Version>1.12.0</Version> <Version>1.13.0</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
<Name>fury</Name> <Name>fury</Name>
<Email>uglyside@yandex.ru</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
<Update release="1"> <Update release="2">
<Date>2021-10-13</Date> <Date>2022-06-10</Date>
<Version>1.11.1</Version> <Version>1.12.0</Version>
<Comment>First build</Comment> <Comment>Version bump.</Comment>
<Name>fury</Name> <Name>fury</Name>
<Email>uglyside@yandex.ru</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
</History> <Update release="1">
<Date>2021-10-13</Date>
<Version>1.11.1</Version>
<Comment>First build</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
</History>
</PISI> </PISI>
util/admin/zeitgeist/actions.py
+7 -7
View File
@@ -4,16 +4,16 @@
# Licensed under the GNU General Public License, version 3. # Licensed under the GNU General Public License, version 3.
# See the file https://www.gnu.org/licenses/gpl-3.0.txt # 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(): def setup():
shelltools.system("NOCONFIGURE=1 ./autogen.sh") shelltools.system("NOCONFIGURE=1 ./autogen.sh")
autotools.configure("--enable-fts") autotools.configure("--enable-fts --enable-datahub")
def build(): def build():
autotools.make() autotools.make()
def install(): def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) data = "nodist_systemd_user_DATA = ''"
doc = "zeitgeistdoc_DATA = 'AUTHORS COPYING MAINTAINERS NEWS'"
pisitools.removeDir("/usr/lib/systemd") autotools.rawInstall("DESTDIR=%s %s %s" % (get.installDIR(), data, doc))
util/admin/zeitgeist/files/Fix_wrong_parameter_for_Event.full()_ctor.patch
+39
View File
@@ -0,0 +1,39 @@
From 1be2a5fff77cdf61c843edc8356dfdef3fd2dbfc Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
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
util/admin/zeitgeist/files/Replace_getargspec_with_getfullargspec.patch
+27
View File
@@ -0,0 +1,27 @@
From 33ab4cce74857f928382ba6cfada111a64dafe88 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
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
util/admin/zeitgeist/files/Use_GenericArray_API_only.patch
-25
View File
@@ -1,25 +0,0 @@
From 64ac3a6f94cd299e5e14945dc31b48f009dec152 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
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
util/admin/zeitgeist/pspec.xml
+103 -98
View File
@@ -1,106 +1,111 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>zeitgeist</Name> <Name>zeitgeist</Name>
<Homepage>https://zeitgeist.freedesktop.org/</Homepage> <Homepage>https://zeitgeist.freedesktop.org/</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<License>LGPL-2.1</License> <License>LGPLv2.1</License>
<IsA>library</IsA> <PartOf>util.admin</PartOf>
<PartOf>util.admin</PartOf> <Summary>Activity logging framework.</Summary>
<Summary>Activity logging framework.</Summary> <Description>Zeitgeist is a service which logs the users's activities and events and makes relevant information available to other applications.</Description>
<Description>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.</Description> <Archive sha1sum="15def247e8aa94d5259ed4dacd596e3645be225b" type="tarbz2">https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/archive/v1.0.4/zeitgeist-v1.0.4.tar.bz2</Archive>
<Archive sha1sum="15def247e8aa94d5259ed4dacd596e3645be225b" type="tarbz2"> <BuildDependencies>
https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/archive/v1.0.4/zeitgeist-v1.0.4.tar.bz2 <Dependency>dbus-devel</Dependency>
</Archive> <Dependency>gtk3-devel</Dependency>
<BuildDependencies> <Dependency>vala-devel</Dependency>
<Dependency>dbus-devel</Dependency> <Dependency>glib2-devel</Dependency>
<Dependency>gtk3-devel</Dependency> <Dependency>python3-six</Dependency>
<Dependency>vala-devel</Dependency> <Dependency>sqlite-devel</Dependency>
<Dependency>glib2-devel</Dependency> <Dependency>python3-devel</Dependency>
<Dependency>sqlite-devel</Dependency> <Dependency>python3-rdflib</Dependency>
<Dependency>python3-six</Dependency> <Dependency>python3-isodate</Dependency>
<Dependency>python3-devel</Dependency> <Dependency>json-glib-devel</Dependency>
<Dependency>python3-rdflib</Dependency> <Dependency>python3-pyparsing</Dependency>
<Dependency>python3-isodate</Dependency> <Dependency>xapian-core-devel</Dependency>
<Dependency>json-glib-devel</Dependency> <Dependency>telepathy-glib-devel</Dependency>
<Dependency>python3-pyparsing</Dependency> <Dependency>gobject-introspection-devel</Dependency>
<Dependency>xapian-core-devel</Dependency> </BuildDependencies>
<Dependency>telepathy-glib-devel</Dependency> <Patches>
<Dependency>gobject-introspection-devel</Dependency> <!-- <Patch level='1'></Patch> -->
</BuildDependencies> <Patch level='1'>Fix_wrong_parameter_for_Event.full()_ctor.patch</Patch>
<Patches> <Patch level='1'>Replace_getargspec_with_getfullargspec.patch</Patch>
<!-- <Patch level='1'>Use_GenericArray_API_only.patch</Patch> --> </Patches>
</Patches> </Source>
</Source>
<Package> <Package>
<Name>zeitgeist</Name> <Name>zeitgeist</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>gtk3</Dependency> <Dependency>gtk3</Dependency>
<Dependency>glib2</Dependency> <Dependency>glib2</Dependency>
<Dependency>sqlite</Dependency> <Dependency>sqlite</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency>python3</Dependency> <Dependency>python3</Dependency>
<Dependency>json-glib</Dependency> <Dependency>json-glib</Dependency>
<Dependency>xapian-core</Dependency> <Dependency>xapian-core</Dependency>
<Dependency>dbus-python3</Dependency> <Dependency>dbus-python3</Dependency>
<Dependency>telepathy-glib</Dependency> <Dependency>telepathy-glib</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="config">/etc/xdg</Path> <Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/libexec/zeitgeist/zeitgeist-fts</Path> <Path fileType="executable">/usr/libexec</Path>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path> <Path fileType="data">/usr/share</Path>
<Path fileType="man">/usr/share/man</Path> </Files>
</Files> </Package>
</Package>
<Package> <Package>
<Name>zeitgeist-devel</Name> <Name>zeitgeist-devel</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release='current'>zeitgeist</Dependency> <Dependency release='current'>zeitgeist</Dependency>
<Dependency>glib2-devel</Dependency> <Dependency>glib2-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path> <Path fileType="data">/usr/lib/pkgconfig</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="4"> <Update release="5">
<Date>2023-11-04</Date> <Date>2025-06-15</Date>
<Version>1.0.4</Version> <Version>1.0.4</Version>
<Comment>Rebuild.</Comment> <Comment>Rebuild.</Comment>
<Name>fury</Name> <Name>PisiLinux Community</Name>
<Email>uglyside@yandex.ru</Email> <Email>admins@pisilinux.org</Email>
</Update> </Update>
<Update release="3"> <Update release="4">
<Date>2022-12-28</Date> <Date>2023-11-04</Date>
<Version>1.0.4</Version> <Version>1.0.4</Version>
<Comment>Rebuild.</Comment> <Comment>Rebuild.</Comment>
<Name>fury</Name> <Name>fury</Name>
<Email>uglyside@yandex.ru</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
<Update release="2"> <Update release="3">
<Date>2022-01-18</Date> <Date>2022-12-28</Date>
<Version>1.0.4</Version> <Version>1.0.4</Version>
<Comment>Version bump</Comment> <Comment>Rebuild.</Comment>
<Name>fury</Name> <Name>fury</Name>
<Email>uglyside@yandex.ru</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
<Update release="1"> <Update release="2">
<Date>2021-10-13</Date> <Date>2022-01-18</Date>
<Version>1.0.3</Version> <Version>1.0.4</Version>
<Comment>First build</Comment> <Comment>Version bump</Comment>
<Name>fury</Name> <Name>fury</Name>
<Email>uglyside@yandex.ru</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
</History> <Update release="1">
<Date>2021-10-13</Date>
<Version>1.0.3</Version>
<Comment>First build</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
</History>
</PISI> </PISI>