Compare commits
No commits in common. 'i10cs' and 'c9' have entirely different histories.
@ -1 +1 @@
|
|||||||
SOURCES/libnotify-0.8.3.tar.xz
|
SOURCES/libnotify-0.7.9.tar.xz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
857d860f38f1e4dfb78d54c1c8ffeb4caf709b7d SOURCES/libnotify-0.8.3.tar.xz
|
75f80afad4d77b4968bfbcd47f4beea5ac2cc87b SOURCES/libnotify-0.7.9.tar.xz
|
||||||
|
|||||||
@ -0,0 +1,139 @@
|
|||||||
|
From 390500fc0c806ed347f76afcfe8a62a74653e81b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ray Strode <rstrode@redhat.com>
|
||||||
|
Date: Tue, 12 May 2020 10:12:26 -0400
|
||||||
|
Subject: [PATCH] notify-send: Give failing exit code if showing notification
|
||||||
|
fails
|
||||||
|
|
||||||
|
Right now notify-send will quietly return a successful exit status
|
||||||
|
even if showing the notification fails.
|
||||||
|
|
||||||
|
This commit changes the behavior to instead fail on failure.
|
||||||
|
|
||||||
|
https://gitlab.gnome.org/GNOME/libnotify/-/merge_requests/13
|
||||||
|
---
|
||||||
|
tools/notify-send.c | 18 ++++++++++++++----
|
||||||
|
1 file changed, 14 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/notify-send.c b/tools/notify-send.c
|
||||||
|
index 67e0b03..52fa46a 100644
|
||||||
|
--- a/tools/notify-send.c
|
||||||
|
+++ b/tools/notify-send.c
|
||||||
|
@@ -105,61 +105,61 @@ notify_notification_set_hint_variant (NotifyNotification *notification,
|
||||||
|
N_("Invalid hint type \"%s\". Valid types "
|
||||||
|
"are int, double, string and byte."),
|
||||||
|
type);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (conv_error) {
|
||||||
|
*error = g_error_new (G_OPTION_ERROR,
|
||||||
|
G_OPTION_ERROR_BAD_VALUE,
|
||||||
|
N_("Value \"%s\" of hint \"%s\" could not be "
|
||||||
|
"parsed as type \"%s\"."), value, key,
|
||||||
|
type);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main (int argc, char *argv[])
|
||||||
|
{
|
||||||
|
static const char *summary = NULL;
|
||||||
|
char *body;
|
||||||
|
static const char *type = NULL;
|
||||||
|
static char *app_name = NULL;
|
||||||
|
static char *icon_str = NULL;
|
||||||
|
static char *icons = NULL;
|
||||||
|
static char **n_text = NULL;
|
||||||
|
static char **hints = NULL;
|
||||||
|
static gboolean do_version = FALSE;
|
||||||
|
- static gboolean hint_error = FALSE;
|
||||||
|
+ static gboolean hint_error = FALSE, show_error = FALSE;
|
||||||
|
static glong expire_timeout = NOTIFY_EXPIRES_DEFAULT;
|
||||||
|
GOptionContext *opt_ctx;
|
||||||
|
NotifyNotification *notify;
|
||||||
|
GError *error = NULL;
|
||||||
|
gboolean retval;
|
||||||
|
|
||||||
|
static const GOptionEntry entries[] = {
|
||||||
|
{"urgency", 'u', 0, G_OPTION_ARG_CALLBACK,
|
||||||
|
g_option_arg_urgency_cb,
|
||||||
|
N_("Specifies the urgency level (low, normal, critical)."),
|
||||||
|
N_("LEVEL")},
|
||||||
|
{"expire-time", 't', 0, G_OPTION_ARG_INT, &expire_timeout,
|
||||||
|
N_
|
||||||
|
("Specifies the timeout in milliseconds at which to expire the "
|
||||||
|
"notification."), N_("TIME")},
|
||||||
|
{"app-name", 'a', 0, G_OPTION_ARG_STRING, &app_name,
|
||||||
|
N_("Specifies the app name for the icon"), N_("APP_NAME")},
|
||||||
|
{"icon", 'i', 0, G_OPTION_ARG_FILENAME, &icons,
|
||||||
|
N_("Specifies an icon filename or stock icon to display."),
|
||||||
|
N_("ICON[,ICON...]")},
|
||||||
|
{"category", 'c', 0, G_OPTION_ARG_FILENAME, &type,
|
||||||
|
N_("Specifies the notification category."),
|
||||||
|
N_("TYPE[,TYPE...]")},
|
||||||
|
{"hint", 'h', 0, G_OPTION_ARG_FILENAME_ARRAY, &hints,
|
||||||
|
N_
|
||||||
|
("Specifies basic extra data to pass. Valid types are int, double, string and byte."),
|
||||||
|
N_("TYPE:NAME:VALUE")},
|
||||||
|
{"version", 'v', 0, G_OPTION_ARG_NONE, &do_version,
|
||||||
|
N_("Version of the package."),
|
||||||
|
NULL},
|
||||||
|
@@ -247,39 +247,49 @@ main (int argc, char *argv[])
|
||||||
|
|
||||||
|
while ((hint = hints[i++])) {
|
||||||
|
tokens = g_strsplit (hint, ":", 3);
|
||||||
|
l = g_strv_length (tokens);
|
||||||
|
|
||||||
|
if (l != 3) {
|
||||||
|
fprintf (stderr, "%s\n",
|
||||||
|
N_("Invalid hint syntax specified. "
|
||||||
|
"Use TYPE:NAME:VALUE."));
|
||||||
|
hint_error = TRUE;
|
||||||
|
} else {
|
||||||
|
retval = notify_notification_set_hint_variant (notify,
|
||||||
|
tokens[0],
|
||||||
|
tokens[1],
|
||||||
|
tokens[2],
|
||||||
|
&error);
|
||||||
|
|
||||||
|
if (!retval) {
|
||||||
|
fprintf (stderr, "%s\n", error->message);
|
||||||
|
g_error_free (error);
|
||||||
|
hint_error = TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
g_strfreev (tokens);
|
||||||
|
if (hint_error)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (!hint_error)
|
||||||
|
- notify_notification_show (notify, NULL);
|
||||||
|
+ if (!hint_error) {
|
||||||
|
+ retval = notify_notification_show (notify, &error);
|
||||||
|
+
|
||||||
|
+ if (!retval) {
|
||||||
|
+ fprintf (stderr, "%s\n", error->message);
|
||||||
|
+ g_error_free (error);
|
||||||
|
+ show_error = TRUE;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
g_object_unref (G_OBJECT (notify));
|
||||||
|
|
||||||
|
notify_uninit ();
|
||||||
|
|
||||||
|
- exit (hint_error);
|
||||||
|
+ if (hint_error || show_error)
|
||||||
|
+ exit (1);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
||||||
@ -1,225 +0,0 @@
|
|||||||
From b0f7fc9293e6ee2d42ebd85ac6c1c8fe15353a8a Mon Sep 17 00:00:00 2001
|
|
||||||
From: rpm-build <rpm-build>
|
|
||||||
Date: Wed, 17 Jul 2024 11:00:42 +0200
|
|
||||||
Subject: [PATCH] drop-docbook5-style-xsl.patch
|
|
||||||
|
|
||||||
---
|
|
||||||
docs/meson.build | 7 +--
|
|
||||||
docs/notify-send.1 | 141 +++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
meson.build | 21 -------
|
|
||||||
meson_options.txt | 2 +-
|
|
||||||
4 files changed, 143 insertions(+), 28 deletions(-)
|
|
||||||
create mode 100644 docs/notify-send.1
|
|
||||||
|
|
||||||
diff --git a/docs/meson.build b/docs/meson.build
|
|
||||||
index 4c5ba64..bd44664 100644
|
|
||||||
--- a/docs/meson.build
|
|
||||||
+++ b/docs/meson.build
|
|
||||||
@@ -30,11 +30,6 @@ if get_option('man')
|
|
||||||
manpages = ['notify-send']
|
|
||||||
|
|
||||||
foreach page : manpages
|
|
||||||
- custom_target(page + '-man',
|
|
||||||
- input: page + '.xml',
|
|
||||||
- output: page + '.1',
|
|
||||||
- command: xsltproc_command,
|
|
||||||
- install: true,
|
|
||||||
- install_dir: man1dir)
|
|
||||||
+ install_man(page + '.1')
|
|
||||||
endforeach
|
|
||||||
endif
|
|
||||||
diff --git a/docs/notify-send.1 b/docs/notify-send.1
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..fb58424
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/docs/notify-send.1
|
|
||||||
@@ -0,0 +1,141 @@
|
|
||||||
+'\" t
|
|
||||||
+.\" Title: notify-send
|
|
||||||
+.\" Author: Andre Filipe de Assuncao e Brito <decko@noisemakers.org>
|
|
||||||
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
|
|
||||||
+.\" Date: November 2005
|
|
||||||
+.\" Manual: User Commands
|
|
||||||
+.\" Source: libnotify
|
|
||||||
+.\" Language: English
|
|
||||||
+.\"
|
|
||||||
+.TH "NOTIFY\-SEND" "1" "" "libnotify" "User Commands"
|
|
||||||
+.\" -----------------------------------------------------------------
|
|
||||||
+.\" * Define some portability stuff
|
|
||||||
+.\" -----------------------------------------------------------------
|
|
||||||
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
+.\" http://bugs.debian.org/507673
|
|
||||||
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
|
|
||||||
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
+.ie \n(.g .ds Aq \(aq
|
|
||||||
+.el .ds Aq '
|
|
||||||
+.\" -----------------------------------------------------------------
|
|
||||||
+.\" * set default formatting
|
|
||||||
+.\" -----------------------------------------------------------------
|
|
||||||
+.\" disable hyphenation
|
|
||||||
+.nh
|
|
||||||
+.\" disable justification (adjust text to left margin only)
|
|
||||||
+.ad l
|
|
||||||
+.\" -----------------------------------------------------------------
|
|
||||||
+.\" * MAIN CONTENT STARTS HERE *
|
|
||||||
+.\" -----------------------------------------------------------------
|
|
||||||
+.SH "NAME"
|
|
||||||
+notify-send \- a program to send desktop notifications
|
|
||||||
+.SH "SYNOPSIS"
|
|
||||||
+.HP \w'\fBnotify\-send\fR\ 'u
|
|
||||||
+\fBnotify\-send\fR [\fIOPTIONS\fR] {\fIsummary\fR} [\fIbody\fR]
|
|
||||||
+.SH "DESCRIPTION"
|
|
||||||
+.PP
|
|
||||||
+With
|
|
||||||
+\fBnotify\-send\fR
|
|
||||||
+you can send desktop notifications to the user via a notification daemon from the command line\&. These notifications can be used to inform the user about an event or display some form of information without getting in the user\(cqs way\&.
|
|
||||||
+.SH "OPTIONS"
|
|
||||||
+.PP
|
|
||||||
+\fB\-?\fR, \fB\-\-help\fR
|
|
||||||
+.RS 4
|
|
||||||
+Show help and exit\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-a\fR, \fB\-\-app\-name\fR=\fIAPP_NAME\fR
|
|
||||||
+.RS 4
|
|
||||||
+Specifies the app name for the notification\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-A\fR, \fB\-\-action\fR=[\fINAME\fR=]\fIText\&.\&.\&.\fR
|
|
||||||
+.RS 4
|
|
||||||
+Specifies the actions to display to the user\&. Implies
|
|
||||||
+\fB\-\-wait\fR
|
|
||||||
+to wait for user input\&. May be set multiple times\&. The
|
|
||||||
+\fINAME\fR
|
|
||||||
+of the action is output to
|
|
||||||
+stdout\&. If
|
|
||||||
+\fINAME\fR
|
|
||||||
+is not specified, the numerical index of the option is used (starting with
|
|
||||||
+1)\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-u\fR, \fB\-\-urgency\fR=\fILEVEL\fR
|
|
||||||
+.RS 4
|
|
||||||
+Specifies the urgency level (low,
|
|
||||||
+normal,
|
|
||||||
+critical)\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-t\fR, \fB\-\-expire\-time\fR=\fITIME\fR
|
|
||||||
+.RS 4
|
|
||||||
+The duration, in milliseconds, for the notification to appear on screen\&.
|
|
||||||
+.sp
|
|
||||||
+Not all implementations use this parameter\&. GNOME Shell and Notify OSD always ignore it, while Plasma ignores it for notifications with the critical urgency level\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-i\fR, \fB\-\-icon\fR=\fIICON\fR
|
|
||||||
+.RS 4
|
|
||||||
+Specifies an icon filename or stock icon to display\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-c\fR, \fB\-\-category\fR=\fITYPE\fR[,\fITYPE\fR\&...]
|
|
||||||
+.RS 4
|
|
||||||
+Specifies the notification category\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-h\fR, \fB\-\-hint\fR=\fITYPE\fR:\fINAME\fR:\fIVALUE\fR
|
|
||||||
+.RS 4
|
|
||||||
+Specifies basic extra data to pass\&. Valid types are
|
|
||||||
+BOOLEAN,
|
|
||||||
+INT,
|
|
||||||
+DOUBLE,
|
|
||||||
+STRING,
|
|
||||||
+BYTE
|
|
||||||
+and
|
|
||||||
+VARIANT\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-p\fR, \fB\-\-print\-id\fR
|
|
||||||
+.RS 4
|
|
||||||
+Print the notification ID\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-r\fR, \fB\-\-replace\-id\fR=\fIREPLACE_ID\fR
|
|
||||||
+.RS 4
|
|
||||||
+The ID of the notification to replace\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-w\fR, \fB\-\-wait\fR
|
|
||||||
+.RS 4
|
|
||||||
+Wait for the notification to be closed before exiting\&. If the
|
|
||||||
+\fBexpire\-time\fR
|
|
||||||
+is set, it will be used as the maximum waiting time\&.
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fB\-e\fR, \fB\-\-transient\fR
|
|
||||||
+.RS 4
|
|
||||||
+Show a transient notification\&. Transient notifications by\-pass the server\*(Aqs persistence capability, if any\&. And so it won\*(Aqt be preserved until the user acknowledges it\&.
|
|
||||||
+.RE
|
|
||||||
+.SH "SEE ALSO"
|
|
||||||
+.PP
|
|
||||||
+The Desktop Notification Spec on
|
|
||||||
+\m[blue]\fBhttps://specifications\&.freedesktop\&.org/notification\-spec/\fR\m[]\&.
|
|
||||||
+.SH "AUTHORS"
|
|
||||||
+.PP
|
|
||||||
+\fBAndre Filipe de Assuncao e Brito\fR <\&decko@noisemakers\&.org\&>
|
|
||||||
+.RS 4
|
|
||||||
+Original author
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fBPaul van Tilburg\fR <\&paulvt@debian\&.org\&>
|
|
||||||
+.RS 4
|
|
||||||
+Original author
|
|
||||||
+.RE
|
|
||||||
+.PP
|
|
||||||
+\fBRiccardo Setti\fR <\&giskard@debian\&.org\&>
|
|
||||||
+.RS 4
|
|
||||||
+Original author
|
|
||||||
+.RE
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 82e796a..9c3fe81 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -55,27 +55,6 @@ configure_file(input: 'config.h.meson',
|
|
||||||
output : 'config.h',
|
|
||||||
configuration : conf)
|
|
||||||
|
|
||||||
-if get_option('man')
|
|
||||||
- xsltproc = find_program('xsltproc', required: true)
|
|
||||||
- stylesheet = 'http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl'
|
|
||||||
- xsltproc_command = [
|
|
||||||
- xsltproc,
|
|
||||||
- '--nonet',
|
|
||||||
- '--stringparam', 'man.output.quietly', '1',
|
|
||||||
- '--stringparam', 'funcsynopsis.style', 'ansi',
|
|
||||||
- '--stringparam', 'man.th.extra1.suppress', '1',
|
|
||||||
- '-o', '@OUTPUT@',
|
|
||||||
- stylesheet,
|
|
||||||
- '@INPUT@',
|
|
||||||
- ]
|
|
||||||
-
|
|
||||||
- testrun = run_command(xsltproc, '--nonet', stylesheet, check: false)
|
|
||||||
-
|
|
||||||
- if testrun.returncode() != 0
|
|
||||||
- error('DocBook stylesheet for generating man pages not found, you need to install docbook-xsl-ns or similar package.')
|
|
||||||
- endif
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
subdir('libnotify')
|
|
||||||
subdir('tools')
|
|
||||||
subdir('docs')
|
|
||||||
diff --git a/meson_options.txt b/meson_options.txt
|
|
||||||
index d20d16d..fb0f005 100644
|
|
||||||
--- a/meson_options.txt
|
|
||||||
+++ b/meson_options.txt
|
|
||||||
@@ -9,7 +9,7 @@ option('introspection',
|
|
||||||
option('man',
|
|
||||||
type: 'boolean',
|
|
||||||
value: true,
|
|
||||||
- description: 'Enable generating the manual page (depends on xsltproc)')
|
|
||||||
+ description: 'Install the manual page')
|
|
||||||
option('gtk_doc',
|
|
||||||
type: 'boolean',
|
|
||||||
value: true,
|
|
||||||
--
|
|
||||||
2.45.1
|
|
||||||
|
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From 34bf541f11b57995a019731e5a8d328422458bd3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David King <amigadave@amigadave.com>
|
||||||
|
Date: Mon, 13 Dec 2021 15:20:32 +0000
|
||||||
|
Subject: [PATCH] docs: Use consistent IDs in spec build
|
||||||
|
|
||||||
|
This avoids differences between IDs for separate builds of the
|
||||||
|
specification.
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1915831
|
||||||
|
---
|
||||||
|
docs/config.xsl | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/docs/config.xsl b/docs/config.xsl
|
||||||
|
index 7aa9def..59490e7 100644
|
||||||
|
--- a/docs/config.xsl
|
||||||
|
+++ b/docs/config.xsl
|
||||||
|
@@ -3,4 +3,5 @@
|
||||||
|
xmlns:fo="http://www.w3.org/1999/XSL/Format"
|
||||||
|
version="1.0">
|
||||||
|
<xsl:param name="html.stylesheet" select="'docbook.css'"/>
|
||||||
|
+ <xsl:param name="generate.consistent.ids" select="1"/>
|
||||||
|
</xsl:stylesheet>
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
||||||
Loading…
Reference in new issue