Merge branch '4fury-c3440d8/master'

This commit is contained in:
Bahar KURT
2025-03-22 12:05:38 +00:00
committed by GitHub
280 changed files with 3695 additions and 46151 deletions
+18 -28
View File
@@ -2,38 +2,28 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
from pisi.actionsapi import autotools, pisitools, get
i = ''.join([
' without-gnutls=no',
' without-ssl=yes',
' without-ntlm=yes',
' without-libsensors=yes',
' INSTALLROOT=/usr',
' INCLUDEDIR=/usr/include/gkrellm2',
' CFLAGS=\'%s\'' % get.CFLAGS(),
' LDFLAGS=\'%s\' ' % get.LDFLAGS()
])
def build():
shelltools.export("LDFLAGS", "%s -lgmodule-2.0" % get.LDFLAGS())
autotools.make('CC=%s \
INSTALLROOT=/usr \
INCLUDEDIR=/usr/include/gkrellm2 \
LOCALEDIR=/usr/share/locale \
STRIP="" \
LINK_FLAGS="%s -Wl,-E" \
enable_nls=1 \
without-ssl=yes \
without-sensors=no \
without-libsensors=yes' % (get.CC(), get.LDFLAGS()))
# without ssl option enables gnutls
autotools.make(i)
def install():
autotools.rawInstall("DESTDIR=%s \
PREFIX=/usr" % get.installDIR())
pisitools.insinto("/etc", "server/gkrellmd.conf")
pisitools.doman("gkrellm.1")
pisitools.doman("gkrellmd.1")
pisitools.dodoc("CREDITS", "README", "Changelog", "COPYRIGHT")
pisitools.dohtml("*")
a = get.installDIR()
b = "DESTDIR=%s PREFIX=/usr CFGDIR=%s/etc" % (a, a)
autotools.rawInstall(b)
pisitools.dodoc("CREDITS", "COPYRIGHT", "COPYING")
pisitools.removeDir("/usr/lib/systemd")
+1
View File
@@ -13,6 +13,7 @@ def start():
startService(command="/usr/bin/gkrellmd",
pidfile=PIDFILE,
makepid=True,
detach=True,
donotify=True)
@synchronized
@@ -1,12 +0,0 @@
diff -Nur gkrellm-2.2.10-old/server/gkrellmd.conf gkrellm-2.2.10/server/gkrellmd.conf
--- gkrellm-2.2.10-old/server/gkrellmd.conf 2007-05-08 00:27:05.073863232 +0300
+++ gkrellm-2.2.10/server/gkrellmd.conf 2007-05-08 00:27:35.880179960 +0300
@@ -26,6 +26,8 @@
#
#user nobody
#group proc
+user nobody
+group nogroup
# Run in background and detach from the controlling terminal
#detach
@@ -1,13 +0,0 @@
[Desktop Entry]
Type=Application
Version=1.0
Encoding=UTF-8
Name=GKrellM
Name[tr]=GKrellM
GenericName=Krell Monitor
GenericName[tr]=Sistem Krell İzleyicisi
Icon=gkrellm
Exec=gkrellm
Terminal=false
StartupNotify=false
Categories=Application;System;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

@@ -1,43 +0,0 @@
Index: gkrellm-2.3.5/server/gkrellmd.conf
===================================================================
--- gkrellm-2.3.5.orig/server/gkrellmd.conf
+++ gkrellm-2.3.5/server/gkrellmd.conf
@@ -4,7 +4,7 @@
# the client update frequency. Values may be from 1 to 10 and should be
# smaller values to reduce network traffic.
#
-#update-hz 3
+update-hz 3
# Limit number of simultaneous clients allowed to connect.
#
@@ -17,7 +17,7 @@
# Specify the port to listen on for connections.
#
-#port 19150
+port 19150
# List of hosts allowed to connect. If no hosts are specified in a
# gkrellmd.conf file or on the command line, all hosts will be allowed.
@@ -38,17 +38,17 @@ group nogroup
# Create a PID file for the running gkrellmd. Default is no PID file.
# NOTE: Option ignored on Windows
#
-#pidfile /var/run/gkrellmd.pid
+pidfile /run/gkrellmd.pid
# Run in background and detach from the controlling terminal
# NOTE: Option ignored on Windows
#
-#detach
+detach
# Enable writing logging message to the system syslog file
# NOTE: On windows this enables logging to the windows event log
#
-#syslog
+syslog
# Time interval between checks for various monitors. If nfs-interval
# is <= 0 then gkrellmd will not read data for nfs file system types.
@@ -1,9 +0,0 @@
[Unit]
Description=GNU Krell Monitors server
After=network.target syslog.target hddtemp.service
[Service]
ExecStart=/usr/bin/gkrellmd
[Install]
WantedBy=multi-user.target
+16 -28
View File
@@ -1,61 +1,42 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>gkrellm</Name>
<Homepage>https://www.gkrellm.net/</Homepage>
<Homepage>https://gkrellm.srcbox.net/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<License>GPLv3</License>
<Icon>gkrellm</Icon>
<IsA>app:gui</IsA>
<IsA>service</IsA>
<Summary>A compact and clean system monitoring tool</Summary>
<Summary>A compact and clean system monitoring tool.</Summary>
<Description>A program to monitor system status, and to collect system information such as memory usage, cpu temperature etc.</Description>
<Archive sha1sum="3d19729843f0bc6f5fbe67518ff5349d2f07d512" type="tarbz2">https://gkrellm.srcbox.net/releases/gkrellm-2.3.11.tar.bz2</Archive>
<Archive sha1sum="f50a24cc6b24a2042aaad30e6e36c0b0146d871f" type="tarbz2">https://gkrellm.srcbox.net/releases/gkrellm-2.4.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>gnutls-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>libICE-devel</Dependency>
<Dependency>libSM-devel</Dependency>
<Dependency>gnutls-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">drop_privileges.patch</Patch>
<Patch level="1">gkrellmd-conf.patch</Patch>
<!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
<Package>
<Name>gkrellm</Name>
<RuntimeDependencies>
<Dependency>gnutls</Dependency>
<Dependency>gtk2</Dependency>
<Dependency>pango</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcrypt</Dependency>
<Dependency>libICE</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>libSM</Dependency>
<Dependency>gnutls</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/gkrellm.desktop">gkrellm.desktop</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/pixmaps/gkrellm.png">gkrellm.png</AdditionalFile>
</AdditionalFiles>
<Provides>
<COMAR script="service.py">System.Service</COMAR>
</Provides>
@@ -65,8 +46,8 @@
<Name>gkrellm-devel</Name>
<Summary>Development files for gkrellm</Summary>
<RuntimeDependencies>
<Dependency release="current">gkrellm</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency release="current">gkrellm</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
@@ -75,6 +56,13 @@
</Package>
<History>
<Update release="9">
<Date>2025-01-29</Date>
<Version>2.4.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2024-11-29</Date>
<Version>2.3.11</Version>
+14 -14
View File
@@ -2,26 +2,26 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import mesontools
from pisi.actionsapi import mesontools, pisitools
i = ''.join([
' --prefix=/usr',
' --buildtype=release',
' -Dintrospection=enabled',
' -Dsystemdsystemunitdir=no',
' -Didevice=enabled',
' -Dpolkit=enabled '
])
def setup():
shelltools.system("sed '/parse_version/d' -i src/linux/integration-test.py")
#pisitools.dosed("configure", "DISABLE_DEPRECATED", deleteLine=True)
mesontools.configure("-Dgtk-doc=false \
-Dudevrulesdir=/lib/udev/rules.d \
-Dudevhwdbdir=/etc/udev/hwdb.d \
-Dintrospection=enabled \
-Dsystemdsystemunitdir=no")
mesontools.configure(i)
def build():
mesontools.build()
def install():
mesontools.install()
pisitools.dodoc("COPYING", "README")
pisitools.dodoc("AUTHORS", "COPYING", "NEWS")
@@ -1,31 +0,0 @@
Bug: https://bugs.gentoo.org/848525
From aa646fa0ca3e164b09949c546796ec50433b748d Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Tue, 17 May 2022 16:02:49 +0200
Subject: [PATCH] meson: Allow unittest inspector to fail
It is only used to make the test output nicer, and it is completely fine
to fail.
Closes: #187
---
src/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/meson.build b/src/meson.build
index b49d5f0..2e1edd1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -124,7 +124,7 @@ if os_backend == 'linux' and gobject_introspection.found()
python3 = find_program('python3')
unittest_inspector = find_program('linux/unittest_inspector.py')
- r = run_command(unittest_inspector, files('linux/integration-test.py'), check: true)
+ r = run_command(unittest_inspector, files('linux/integration-test.py'), check: false)
unit_tests = r.stdout().strip().split('\n')
foreach ut: unit_tests
--
2.35.1
@@ -1,28 +0,0 @@
From 694207d3f08bdd2095f01eee09eb523363800825 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 16 Jun 2020 14:04:25 +0200
Subject: [PATCH] build: Use a newer libplist if available
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a96b794..5f08d91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,8 +202,10 @@ if test x$with_backend = xlinux; then
PKG_CHECK_MODULES(USB, [libusb-1.0 >= 1.0.0])
AC_ARG_WITH(idevice, AS_HELP_STRING([--without-idevice],[Build without libimobiledevice]),
with_idevice=$withval,with_idevice=yes)
+ LIBPLIST_DEP=libplist
+ PKG_CHECK_EXISTS(libplist-2.0, LIBPLIST_DEP=libplist-2.0)
AS_IF([test "x$with_idevice" != "xno"],
- [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 libplist >= 0.12, have_idevice=yes, have_idevice=no)],
+ [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 $LIBPLIST_DEP, have_idevice=yes, have_idevice=no)],
[have_idevice=no])
AS_IF([test "x$have_idevice" = "xyes"],
[AC_DEFINE(HAVE_IDEVICE, 1, [Define to 1 if iDevice is going to be built])])
--
2.26.2
@@ -1,76 +0,0 @@
From 97185bae75b16bea48d532aa5511417e485b1c06 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 17 Jun 2020 10:51:09 +0200
Subject: [PATCH] linux: Add support for iPhone XR, XS models
Modifying the udev serial to be acceptable as an hyphened UDID, as the
usbmux stack expects.
Closes: #114
---
src/linux/up-device-idevice.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/linux/up-device-idevice.c b/src/linux/up-device-idevice.c
index a808269..d2fa0a1 100644
--- a/src/linux/up-device-idevice.c
+++ b/src/linux/up-device-idevice.c
@@ -203,6 +203,28 @@ out:
return G_SOURCE_CONTINUE;
}
+static char *
+get_device_uuid (GUdevDevice *native)
+{
+ const char *uuid;
+ char *retval;
+
+ uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT");
+ if (uuid == NULL)
+ return NULL;
+
+ if (strlen (uuid) != 24)
+ return g_strdup (uuid);
+
+ /* new style UDID: add hyphen between first 8 and following 16 digits */
+ retval = g_malloc0 (24 + 1 + 1);
+ memcpy (&retval[0], &uuid[0], 8);
+ retval[8] = '-';
+ memcpy (&retval[9], &uuid[8], 16);
+
+ return retval;
+}
+
/**
* up_device_idevice_coldplug:
*
@@ -213,7 +235,7 @@ up_device_idevice_coldplug (UpDevice *device)
{
UpDeviceIdevice *idevice = UP_DEVICE_IDEVICE (device);
GUdevDevice *native;
- const gchar *uuid;
+ char *uuid;
const gchar *model;
UpDeviceKind kind;
@@ -223,7 +245,7 @@ up_device_idevice_coldplug (UpDevice *device)
return FALSE;
/* Get the UUID */
- uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT");
+ uuid = get_device_uuid (native);
if (uuid == NULL)
return FALSE;
@@ -253,6 +275,8 @@ up_device_idevice_coldplug (UpDevice *device)
g_source_set_name_by_id (idevice->priv->start_id,
"[upower] up_device_idevice_start_poll_cb (linux)");
+ g_free (uuid);
+
return TRUE;
}
--
2.26.2
@@ -0,0 +1,14 @@
diff --git a/po/LINGUAS b/po/LINGUAS
index 0e617f9..5258b29 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -2,6 +2,7 @@
#
fr
it
-sv
+ka
pl
-
+sv
+tr
@@ -1,8 +0,0 @@
--- upower-0.9.4.orig/po/LINGUAS
+++ upower-0.9.4/po/LINGUAS
@@ -3,4 +3,4 @@
it
sv
pl
-
+tr
@@ -1,34 +0,0 @@
From b9cff29978113aefe3ad18521f383f12ab099a34 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimo@endlessm.com>
Date: Tue, 25 Feb 2014 09:43:04 +0000
Subject: Create the history directory at runtime
In addition to build time - this increases compatibilty with OSTree,
which starts out with an empty /var.
Signed-off-by: Richard Hughes <richard@hughsie.com>
---
diff --git a/src/up-history.c b/src/up-history.c
index f9d0fdf..795b093 100644
--- a/src/up-history.c
+++ b/src/up-history.c
@@ -414,6 +414,7 @@ up_history_set_directory (UpHistory *history, const gchar *dir)
{
g_free (history->priv->dir);
history->priv->dir = g_strdup (dir);
+ g_mkdir_with_parents (dir, 0755);
}
/**
@@ -887,7 +888,8 @@ up_history_init (UpHistory *history)
history->priv->data_time_full = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
history->priv->data_time_empty = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
history->priv->max_data_age = UP_HISTORY_DEFAULT_MAX_DATA_AGE;
- history->priv->dir = g_build_filename (HISTORY_DIR, NULL);
+
+ up_history_set_directory (history, HISTORY_DIR);
}
/**
--
cgit v0.9.0.2-2-gbebe
@@ -1,24 +0,0 @@
From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001
From: Martin Pitt <martinpitt@gnome.org>
Date: Fri, 08 Nov 2013 13:59:50 +0000
Subject: lib: Fix segfault on getting property when daemon is not running
This fixes "upower --version" when the daemon is not running, and thus the
client proxy is NULL.
---
diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
index 35d7b5d..17fb02d 100644
--- a/libupower-glib/up-client.c
+++ b/libupower-glib/up-client.c
@@ -322,6 +322,9 @@ up_client_get_property (GObject *object,
UpClient *client;
client = UP_CLIENT (object);
+ if (client->priv->proxy == NULL)
+ return;
+
switch (prop_id) {
case PROP_DAEMON_VERSION:
g_value_set_string (value, up_client_glue_get_daemon_version (client->priv->proxy));
--
cgit v0.9.0.2-2-gbebe
+24 -41
View File
@@ -1,76 +1,54 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>upower</Name>
<Homepage>http://upower.freedesktop.org</Homepage>
<Homepage>https://upower.freedesktop.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2+</License>
<License>GPLv2</License>
<IsA>library</IsA>
<IsA>app:console</IsA>
<Summary>Power Management Service</Summary>
<Summary>Power Management Service.</Summary>
<Description>upower provides a daemon, API and command line tools for managing power devices attached to the system.</Description>
<Archive sha1sum="82b69c2c59c49d75f2e3c81a3d086d5d1ebda1f2" type="tarbz2">https://gitlab.freedesktop.org/upower/upower/-/archive/v1.90.4/upower-v1.90.4.tar.bz2</Archive>
<Archive sha1sum="3adc836ddc1558485330dc8d77491689c3c711ee" type="tarbz2">https://gitlab.freedesktop.org/upower/upower/-/archive/v1.90.7/upower-v1.90.7.tar.bz2</Archive>
<AdditionalFiles>
<AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>gtk-doc</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>polkit-devel</Dependency>
<Dependency>dbus-glib-devel</Dependency>
<Dependency>libgudev-devel</Dependency>
<Dependency>libusb-devel</Dependency>
<Dependency>libplist-devel</Dependency>
<Dependency>libimobiledevice-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>intltool</Dependency>
<Dependency>gtk-doc</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">add-tr.patch</Patch>
<!-- <Patch level="1">0.99.18-meson-Allow-unittest-inspector-to-fail.patch</Patch> -->
<!-- <Patch level="1">0001-build-Use-a-newer-libplist-if-available.patch</Patch> -->
<!-- <Patch level="1"></Patch> -->
<Patch level="1">LINGUAS.patch</Patch>
</Patches>
</Source>
<Package>
<Name>upower</Name>
<RuntimeDependencies>
<Dependency>dbus</Dependency>
<Dependency>glib2</Dependency>
<Dependency>polkit</Dependency>
<Dependency>dbus-glib</Dependency>
<Dependency>libgudev</Dependency>
<Dependency>libplist</Dependency>
<Dependency>libimobiledevice</Dependency>
<!-- <Dependency versionFrom="1.4.1">pm-utils</Dependency> -->
<Dependency>libusb</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="data">/lib</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/etc/dbus-1</Path>
<Path fileType="config">/etc/udev/hwdb.d/95-upower-hid.hwdb</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="config">/etc/UPower</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/var/lib/upower</Path>
<Path fileType="data">/usr/share/gir-1.0</Path>
<Path fileType="data">/usr/share/dbus-1</Path>
<Path fileType="executable">/usr/libexec</Path>
<Path fileType="data">/usr/share/polkit-1</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="data">/usr/share/dbus-1/interfaces/*.xml</Path>
<Path fileType="data">/usr/lib/girepository-1.0/*.typelib</Path>
<Path fileType="data">/usr/share/installed-tests/upower/upower-integration.test</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="data">/var</Path>
</Files>
</Package>
@@ -78,22 +56,27 @@
<Name>upower-devel</Name>
<Summary>Development files for upower</Summary>
<RuntimeDependencies>
<Dependency release="current">upower</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>polkit-devel</Dependency>
<Dependency>dbus-glib-devel</Dependency>
<Dependency>libgudev-devel</Dependency>
<Dependency>libplist-devel</Dependency>
<Dependency>libimobiledevice-devel</Dependency>
<Dependency release="current">upower</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/libexec/upower</Path>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/share/gir-1.0</Path>
<Path fileType="data">/usr/share/installed-tests</Path>
</Files>
</Package>
<History>
<Update release="19">
<Date>2025-01-30</Date>
<Version>1.90.7</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="18">
<Date>2024-04-09</Date>
<Version>1.90.4</Version>