Accepting request 69743 from GNOME:Factory
Update to 0.11 (forwarded request 69741 from vuntz) OBS-URL: https://build.opensuse.org/request/show/69743 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/startup-notification?expand=0&rev=16
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
f4fa2bbc57
@ -1,3 +1,3 @@
|
|||||||
libstartup-notification-1-0
|
libstartup-notification-1-0
|
||||||
provides "startup-notification-<targettype> = <version>"
|
provides "startup-notification-<targettype> = <version>"
|
||||||
obsoletes "startup-notification-<targettype> <= <version>"
|
obsoletes "startup-notification-<targettype> < <version>"
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:25b3585682b14aa1528d43c8d6c9180493bf8878f0a2ff248a37d3d96c5cf9a4
|
|
||||||
size 248651
|
|
||||||
3
startup-notification-0.11.tar.bz2
Normal file
3
startup-notification-0.11.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:dff81545e540dba20f489fc03c0739bb5e195e2da2e4467594342f100a8cecd8
|
||||||
|
size 276743
|
||||||
@ -1,173 +0,0 @@
|
|||||||
From 1b14d72976741afc33d9f7fac22e20b831e47e1f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Colin Walters <walters@verbum.org>
|
|
||||||
Date: Thu, 25 Feb 2010 20:33:54 +0000
|
|
||||||
Subject: Support APPLICATION_ID key
|
|
||||||
|
|
||||||
For moving GNOME to an application-based system, it's useful if
|
|
||||||
launcher systems say which .desktop file they're launching, so
|
|
||||||
that we can show it as the current focus even while a launch is
|
|
||||||
in progress.
|
|
||||||
|
|
||||||
Signed-off-by: Julien Danjou <julien@danjou.info>
|
|
||||||
---
|
|
||||||
diff --git a/doc/startup-notification.txt b/doc/startup-notification.txt
|
|
||||||
index cf5b250..dd1ccc2 100644
|
|
||||||
--- a/doc/startup-notification.txt
|
|
||||||
+++ b/doc/startup-notification.txt
|
|
||||||
@@ -300,6 +300,16 @@ The following keys may be provided optionally in either a "new" or a
|
|
||||||
have their window mapped on the desktop specified by
|
|
||||||
the value of DESKTOP.
|
|
||||||
|
|
||||||
+ APPLICATION_ID
|
|
||||||
+
|
|
||||||
+ When launching an application using a .desktop file from
|
|
||||||
+ the normal application paths (see desktop file specification),
|
|
||||||
+ this should be basename of the .desktop file.
|
|
||||||
+ For example: "foo.desktop".
|
|
||||||
+
|
|
||||||
+ When launching a .desktop file NOT in the paths, this should
|
|
||||||
+ be an absolute path to the .desktop file.
|
|
||||||
+
|
|
||||||
Some details of the startup sequence:
|
|
||||||
|
|
||||||
- "new" and "change" messages are sent by the launcher code
|
|
||||||
diff --git a/libsn/sn-launcher.c b/libsn/sn-launcher.c
|
|
||||||
index 21344cd..089b5c2 100644
|
|
||||||
--- a/libsn/sn-launcher.c
|
|
||||||
+++ b/libsn/sn-launcher.c
|
|
||||||
@@ -44,6 +44,7 @@ struct SnLauncherContext
|
|
||||||
char *wmclass;
|
|
||||||
char *binary_name;
|
|
||||||
char *icon_name;
|
|
||||||
+ char *application_id;
|
|
||||||
struct timeval initiation_time;
|
|
||||||
unsigned int completed : 1;
|
|
||||||
unsigned int canceled : 1;
|
|
||||||
@@ -121,6 +122,7 @@ sn_launcher_context_unref (SnLauncherContext *context)
|
|
||||||
sn_free (context->wmclass);
|
|
||||||
sn_free (context->binary_name);
|
|
||||||
sn_free (context->icon_name);
|
|
||||||
+ sn_free (context->application_id);
|
|
||||||
|
|
||||||
sn_display_unref (context->display);
|
|
||||||
sn_free (context);
|
|
||||||
@@ -266,9 +268,16 @@ sn_launcher_context_initiate (SnLauncherContext *context,
|
|
||||||
values[i] = context->icon_name;
|
|
||||||
++i;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+
|
|
||||||
+ if (context->application_id != NULL)
|
|
||||||
+ {
|
|
||||||
+ names[i] = "APPLICATION_ID";
|
|
||||||
+ values[i] = context->application_id;
|
|
||||||
+ ++i;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
assert (i < MAX_PROPS);
|
|
||||||
-
|
|
||||||
+
|
|
||||||
names[i] = NULL;
|
|
||||||
values[i] = NULL;
|
|
||||||
|
|
||||||
@@ -433,6 +442,16 @@ sn_launcher_context_set_icon_name (SnLauncherContext *context,
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
+sn_launcher_set_application_id (SnLauncherContext *context,
|
|
||||||
+ const char *desktop_file)
|
|
||||||
+{
|
|
||||||
+ WARN_ALREADY_INITIATED (context);
|
|
||||||
+
|
|
||||||
+ sn_free (context->application_id);
|
|
||||||
+ context->application_id = sn_internal_strdup (desktop_file);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
sn_launcher_context_set_extra_property (SnLauncherContext *context,
|
|
||||||
const char *name,
|
|
||||||
const char *value)
|
|
||||||
diff --git a/libsn/sn-launcher.h b/libsn/sn-launcher.h
|
|
||||||
index f88f11c..9cd34fd 100644
|
|
||||||
--- a/libsn/sn-launcher.h
|
|
||||||
+++ b/libsn/sn-launcher.h
|
|
||||||
@@ -61,6 +61,8 @@ void sn_launcher_context_set_binary_name (SnLauncherContext *context,
|
|
||||||
const char *name);
|
|
||||||
void sn_launcher_context_set_icon_name (SnLauncherContext *context,
|
|
||||||
const char *name);
|
|
||||||
+void sn_launcher_context_set_application_id (SnLauncherContext *context,
|
|
||||||
+ const char *desktop_file);
|
|
||||||
|
|
||||||
void sn_launcher_context_set_extra_property (SnLauncherContext *context,
|
|
||||||
const char *name,
|
|
||||||
diff --git a/libsn/sn-monitor.c b/libsn/sn-monitor.c
|
|
||||||
index 223473a..035d523 100644
|
|
||||||
--- a/libsn/sn-monitor.c
|
|
||||||
+++ b/libsn/sn-monitor.c
|
|
||||||
@@ -66,7 +66,8 @@ struct SnStartupSequence
|
|
||||||
Time timestamp;
|
|
||||||
|
|
||||||
char *binary_name;
|
|
||||||
- char *icon_name;
|
|
||||||
+ char *icon_name;
|
|
||||||
+ char *application_id;
|
|
||||||
|
|
||||||
unsigned int completed : 1;
|
|
||||||
unsigned int canceled : 1;
|
|
||||||
@@ -269,7 +270,8 @@ sn_startup_sequence_unref (SnStartupSequence *sequence)
|
|
||||||
sn_free (sequence->wmclass);
|
|
||||||
sn_free (sequence->binary_name);
|
|
||||||
sn_free (sequence->icon_name);
|
|
||||||
-
|
|
||||||
+ sn_free (sequence->application_id);
|
|
||||||
+
|
|
||||||
sn_display_unref (sequence->display);
|
|
||||||
sn_free (sequence);
|
|
||||||
}
|
|
||||||
@@ -337,6 +339,12 @@ sn_startup_sequence_get_icon_name (SnStartupSequence *sequence)
|
|
||||||
return sequence->icon_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
+const char*
|
|
||||||
+sn_startup_sequence_get_application_id (SnStartupSequence *sequence)
|
|
||||||
+{
|
|
||||||
+ return sequence->application_id;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
int
|
|
||||||
sn_startup_sequence_get_screen (SnStartupSequence *sequence)
|
|
||||||
{
|
|
||||||
@@ -805,10 +813,18 @@ xmessage_func (SnDisplay *display,
|
|
||||||
changed = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ else if (strcmp (names[i], "APPLICATION_ID") == 0)
|
|
||||||
+ {
|
|
||||||
+ if (sequence->application_id == NULL)
|
|
||||||
+ {
|
|
||||||
+ sequence->application_id = sn_internal_strdup (values[i]);
|
|
||||||
+ changed = TRUE;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
else if (strcmp (names[i], "DESKTOP") == 0)
|
|
||||||
{
|
|
||||||
int workspace;
|
|
||||||
-
|
|
||||||
+
|
|
||||||
workspace = sn_internal_string_to_ulong (values[i]);
|
|
||||||
|
|
||||||
sequence->workspace = workspace;
|
|
||||||
diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h
|
|
||||||
index 15a38d7..b58581f 100644
|
|
||||||
--- a/libsn/sn-monitor.h
|
|
||||||
+++ b/libsn/sn-monitor.h
|
|
||||||
@@ -73,6 +73,7 @@ Time sn_startup_sequence_get_timestamp (SnStartupSequence *se
|
|
||||||
const char* sn_startup_sequence_get_wmclass (SnStartupSequence *sequence);
|
|
||||||
const char* sn_startup_sequence_get_binary_name (SnStartupSequence *sequence);
|
|
||||||
const char* sn_startup_sequence_get_icon_name (SnStartupSequence *sequence);
|
|
||||||
+const char* sn_startup_sequence_get_application_id (SnStartupSequence *sequence);
|
|
||||||
int sn_startup_sequence_get_screen (SnStartupSequence *sequence);
|
|
||||||
|
|
||||||
void sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence,
|
|
||||||
--
|
|
||||||
cgit v0.8.3-6-g21f6
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
From 76ede84816d187e3c6ce11ec03dbe9167f5738dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Julien Danjou <julien@danjou.info>
|
|
||||||
Date: Mon, 24 May 2010 12:25:02 +0000
|
|
||||||
Subject: Fix sn-launcher not using screen number
|
|
||||||
|
|
||||||
Signed-off-by: Julien Danjou <julien@danjou.info>
|
|
||||||
---
|
|
||||||
diff --git a/libsn/sn-launcher.c b/libsn/sn-launcher.c
|
|
||||||
index 089b5c2..f1d5e99 100644
|
|
||||||
--- a/libsn/sn-launcher.c
|
|
||||||
+++ b/libsn/sn-launcher.c
|
|
||||||
@@ -78,6 +78,7 @@ sn_launcher_context_new (SnDisplay *display,
|
|
||||||
|
|
||||||
context->refcount = 1;
|
|
||||||
context->display = display;
|
|
||||||
+ context->screen = screen;
|
|
||||||
sn_display_ref (context->display);
|
|
||||||
|
|
||||||
context->workspace = -1;
|
|
||||||
--
|
|
||||||
cgit v0.8.3-6-g21f6
|
|
||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 6 10:30:24 CEST 2011 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 0.11:
|
||||||
|
+ Remove Xlib support, use only xcb and x11-xcb
|
||||||
|
+ Support APPLICATION_ID key
|
||||||
|
- Drop startup-notification-application-id.patch and
|
||||||
|
startup-notification-sn-launcher-screen.patch: fixed upstream.
|
||||||
|
- Fix License tags: the librarys is LGPLv2+, not GPLv2+.
|
||||||
|
- Change startup-notification Obsoletes from <= to < now that we
|
||||||
|
have a new upstream version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Oct 11 18:16:25 CEST 2010 - vuntz@opensuse.org
|
Mon Oct 11 18:16:25 CEST 2010 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package startup-notification (Version 0.10)
|
# spec file for package startup-notification (Version 0.11)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -19,20 +19,15 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: startup-notification
|
Name: startup-notification
|
||||||
BuildRequires: xorg-x11-devel
|
Version: 0.11
|
||||||
Url: http://www.freedesktop.org/wiki/Software/startup-notification
|
Release: 1
|
||||||
License: GPLv2+
|
|
||||||
Group: System/X11/Utilities
|
|
||||||
Version: 0.10
|
|
||||||
Release: 10
|
|
||||||
# NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf)
|
|
||||||
Summary: Reference Implementation for the Startup-Notification Protocol
|
Summary: Reference Implementation for the Startup-Notification Protocol
|
||||||
|
License: LGPLv2+
|
||||||
|
Group: System/X11/Utilities
|
||||||
|
Url: http://www.freedesktop.org/wiki/Software/startup-notification
|
||||||
Source: startup-notification-%{version}.tar.bz2
|
Source: startup-notification-%{version}.tar.bz2
|
||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
# PATCH-FEATURE-UPSTREAM startup-notification-application-id.patch vuntz@opensuse.org -- Add git commit to support APPLICATION_ID. This is useful for gnome-shell.
|
BuildRequires: xorg-x11-devel
|
||||||
Patch0: startup-notification-application-id.patch
|
|
||||||
# PATCH-FIX-UPSTREAM startup-notification-sn-launcher-screen.patch vuntz@opensuse.org -- Taken from git, to use the screen number in sn-launcher
|
|
||||||
Patch1: startup-notification-sn-launcher-screen.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -40,12 +35,11 @@ Startup-notification contains a reference implementation of the
|
|||||||
startup-notification protocol.
|
startup-notification protocol.
|
||||||
|
|
||||||
%package -n libstartup-notification-1-0
|
%package -n libstartup-notification-1-0
|
||||||
License: GPLv2+
|
License: LGPLv2+
|
||||||
Group: System/X11/Utilities
|
Group: System/X11/Utilities
|
||||||
Summary: Reference Implementation for the Startup-Notification Protocol
|
Summary: Reference Implementation for the Startup-Notification Protocol
|
||||||
Provides: %{name} = %{version}
|
Provides: %{name} = %{version}
|
||||||
# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 0.10 (when this provides/obsoletes was introduced)
|
Obsoletes: %{name} < %{version}
|
||||||
Obsoletes: %{name} <= %{version}
|
|
||||||
# bug437293
|
# bug437293
|
||||||
%ifarch ppc64
|
%ifarch ppc64
|
||||||
Obsoletes: startup-notification-64bit
|
Obsoletes: startup-notification-64bit
|
||||||
@ -57,7 +51,7 @@ Startup-notification contains a reference implementation of the
|
|||||||
startup-notification protocol.
|
startup-notification protocol.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
License: GPLv2+
|
License: LGPLv2+
|
||||||
Summary: Include Files and Libraries mandatory for Development
|
Summary: Include Files and Libraries mandatory for Development
|
||||||
Group: Development/Libraries/GNOME
|
Group: Development/Libraries/GNOME
|
||||||
Requires: libstartup-notification-1-0 = %{version}
|
Requires: libstartup-notification-1-0 = %{version}
|
||||||
@ -73,8 +67,6 @@ to develop applications that require these.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static
|
%configure --disable-static
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user