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

gdm, budgie-desktop, budgie-screensaver, adobe-source-code-pro-fonts, epiphany, evolution, gnome-initial-setup, gnome-online-miners, gnome-user-docs packaged

Browse Source
This commit is contained in:
Berk Çakar
2021-06-08 03:48:32 +03:00
parent e4d9187a13
commit 9ed1a82253
33 changed files with 3311 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/budgie/budgie-screensaver/actions.py
+20
View File
@@ -0,0 +1,20 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
autotools.configure()
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("COPYING*", "NEWS", "README*", "AUTHORS", "ChangeLog")
desktop/budgie/budgie-screensaver/files/0001-Fix-killing-gjs.patch
+93
View File
@@ -0,0 +1,93 @@
From 1553374b9c5db3db8232738dc8fa747684b070d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
Date: Fri, 30 Apr 2021 15:58:22 +0200
Subject: [PATCH] Fix killing gjs
---
src/gnome-screensaver.c | 22 +++++++++++-----------
src/gs-listener-dbus.c | 29 ++++++++++++-----------------
2 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/src/gnome-screensaver.c b/src/gnome-screensaver.c
index d2ccae3..96a7d49 100644
--- a/src/gnome-screensaver.c
+++ b/src/gnome-screensaver.c
@@ -82,17 +82,17 @@ main (int argc,
exit (1);
}
- gchar** env_vars = g_get_environ(); // Get our list of environment variables
- gchar* desktop = g_environ_getenv(env_vars, "XDG_CURRENT_DESKTOP"); // Get the current desktop value
-
- if (desktop != NULL) { // Got a value
- if (!g_str_has_prefix(desktop, "Budgie")) { // Does not start with Budgie
- g_message("Not running under Budgie, exiting.");
- exit(1);
- }
- }
-
- g_strfreev(env_vars); // Free our environment variables
+ if (g_find_program_in_path("pkill") != NULL) { // Have pkill
+ g_spawn_command_line_sync("pkill -9 -f '/usr/bin/gjs /usr/share/gnome-shell/org.gnome.ScreenSaver'",
+ NULL,
+ NULL,
+ NULL,
+ &error);
+ if (error) {
+ g_warning("Failed to kill gjs: %s", error->message);
+ g_error_free (error);
+ }
+ }
gs_debug_init (debug, FALSE);
gs_debug ("initializing budgie-screensaver %s", VERSION);
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index 124d83a..f667127 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -1334,6 +1334,14 @@ gs_listener_acquire (GSListener *listener,
_("not connected to the message bus"));
return FALSE;
}
+ if (screensaver_is_running (listener->priv->connection)) {
+ g_set_error (error,
+ GS_LISTENER_ERROR,
+ GS_LISTENER_ERROR_ACQUISITION_FAILURE,
+ "%s",
+ _("screensaver already running in this session"));
+ return FALSE;
+ }
dbus_error_init (&buserror);
@@ -1345,23 +1353,10 @@ gs_listener_acquire (GSListener *listener,
return FALSE;
}
- if (g_find_program_in_path("pkill") != NULL) { // Have pkill
- char *argv[5];
- argv[0] = "pkill";
- argv[1] = "-9";
- argv[2] = "-f";
- argv[3] = "'/usr/bin/gjs /usr/share/gnome-shell/org.gnome.ScreenSaver'";
- argv[4] = NULL;
-
- g_autoptr(GError) error = NULL;
- gboolean kill_ret = g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, NULL, &error);
-
- if (!kill_ret) {
- g_warning("Failed to kill gjs: %s", error->message);
- }
- }
-
- res = dbus_bus_request_name (listener->priv->connection, GS_SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING, &buserror);
+ res = dbus_bus_request_name (listener->priv->connection,
+ GS_SERVICE,
+ DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT,
+ &buserror);
if (dbus_error_is_set (&buserror)) {
g_set_error (error,
GS_LISTENER_ERROR,
--
2.31.1
desktop/budgie/budgie-screensaver/pspec.xml
+69
View File
@@ -0,0 +1,69 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>budgie-screensaver</Name>
<Homepage>https://github.com/solus-project/budgie-desktop</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Summary>Fork of GNOME Screensaver for Budgie 10.</Summary>
<Description>Budgie Screensaver is a fork of gnome-screensaver intended for use with Budgie Desktop and is similar in purpose to other screensavers such as MATE Screensaver.</Description>
<Archive sha1sum="0d7ec5cedc0d279af7538ae154ee62af1bc22539" type="tarxz">https://github.com/getsolus/budgie-screensaver/releases/download/v4.0/budgie-screensaver-v4.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>dbus-glib-devel</Dependency>
<Dependency>gnome-desktop-devel</Dependency>
<Dependency>pam-devel</Dependency>
<Dependency>elogind-devel</Dependency>
<Dependency>gsettings-desktop-schemas-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>libseccomp-devel</Dependency>
<Dependency>intltool</Dependency>
<Dependency>glib2-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">0001-Fix-killing-gjs.patch</Patch>
</Patches>
</Source>
<Package>
<Name>budgie-screensaver</Name>
<RuntimeDependencies>
<Dependency>pam</Dependency>
<Dependency>dbus</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>cairo</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
<Dependency>elogind</Dependency>
<Dependency>libXext</Dependency>
<Dependency>dbus-glib</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>libXxf86vm</Dependency>
<Dependency>libXxf86misc</Dependency>
<Dependency>gnome-desktop</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/etc/pam.d</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="executable">/usr/libexec</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/applications</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2021-06-05</Date>
<Version>4.0</Version>
<Comment>First release for Pisi Linux</Comment>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Update>
</History>
</PISI>