Hello community,
here is the log from the commit of package notification-daemon for openSUSE:Factory
checked in at Tue Dec 8 12:01:55 CET 2009.
--------
--- GNOME/notification-daemon/notification-daemon.changes 2009-04-25 02:19:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/notification-daemon/notification-daemon.changes 2009-12-03 10:31:36.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 3 10:31:21 CET 2009 - vuntz@opensuse.org
+
+- Rebase notification-daemon-new-bubble.patch to apply without
+ fuzz.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ notification-daemon.spec ++++++
--- /var/tmp/diff_new_pack.VvFnXP/_old 2009-12-08 12:01:33.000000000 +0100
+++ /var/tmp/diff_new_pack.VvFnXP/_new 2009-12-08 12:01:33.000000000 +0100
@@ -30,10 +30,10 @@
BuildRequires: libwnck-devel
BuildRequires: update-desktop-files
Version: 0.4.0
-Release: 3
+Release: 4
Url: http://www.galago-project.org/
Group: System/Daemons
-License: GPL v2 or later
+License: GPLv2+
Summary: Notification Daemon
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM notification-daemon-memleak.patch vuntz@novell.com -- Fix a memory leak, patch from Ubuntu.
@@ -50,12 +50,6 @@
%description
D-BUS notification daemon.
-
-
-Authors:
---------
- Christian Hammond
-
%lang_package
%prep
%setup -q
@@ -89,6 +83,7 @@
rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
+
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
++++++ notification-daemon-new-bubble.patch ++++++
--- /var/tmp/diff_new_pack.VvFnXP/_old 2009-12-08 12:01:33.000000000 +0100
+++ /var/tmp/diff_new_pack.VvFnXP/_new 2009-12-08 12:01:33.000000000 +0100
@@ -17,11 +17,11 @@
widget "notification-window.GtkEventBox.GtkVBox" style "notification-magic"
-Index: notification-daemon-0.3.7/src/daemon/daemon.c
+Index: notification-daemon-0.4.0/src/daemon/daemon.c
===================================================================
---- notification-daemon-0.3.7.orig/src/daemon/daemon.c
-+++ notification-daemon-0.3.7/src/daemon/daemon.c
-@@ -1276,7 +1276,7 @@ notify_daemon_notify_handler(NotifyDaemo
+--- notification-daemon-0.4.0.orig/src/daemon/daemon.c
++++ notification-daemon-0.4.0/src/daemon/daemon.c
+@@ -1286,7 +1286,7 @@ notify_daemon_notify_handler(NotifyDaemo
* sync_notification_position later.
*/
}
@@ -30,10 +30,10 @@
{
/*
* Typically, the theme engine will set its own position based on
-Index: notification-daemon-0.3.7/src/daemon/engines.c
+Index: notification-daemon-0.4.0/src/daemon/engines.c
===================================================================
---- notification-daemon-0.3.7.orig/src/daemon/engines.c
-+++ notification-daemon-0.3.7/src/daemon/engines.c
+--- notification-daemon-0.4.0.orig/src/daemon/engines.c
++++ notification-daemon-0.4.0/src/daemon/engines.c
@@ -30,6 +30,7 @@ typedef struct
void (*move_notification)(GtkWindow *nw, int x, int y);
void (*set_notification_timeout)(GtkWindow *nw, glong timeout);
@@ -50,7 +50,7 @@
if (!engine->theme_check_init(NOTIFICATION_DAEMON_MAJOR_VERSION,
NOTIFICATION_DAEMON_MINOR_VERSION,
-@@ -293,3 +295,14 @@ theme_move_notification(GtkWindow *nw, i
+@@ -302,3 +304,14 @@ theme_move_notification(GtkWindow *nw, i
ThemeEngine *engine = g_object_get_data(G_OBJECT(nw), "_theme_engine");
engine->move_notification(nw, x, y);
}
@@ -65,10 +65,10 @@
+ else
+ return FALSE;
+}
-Index: notification-daemon-0.3.7/src/daemon/engines.h
+Index: notification-daemon-0.4.0/src/daemon/engines.h
===================================================================
---- notification-daemon-0.3.7.orig/src/daemon/engines.h
-+++ notification-daemon-0.3.7/src/daemon/engines.h
+--- notification-daemon-0.4.0.orig/src/daemon/engines.h
++++ notification-daemon-0.4.0/src/daemon/engines.h
@@ -21,5 +21,6 @@ void theme_add_notification_action(GtkWi
const char *key, GCallback cb);
void theme_clear_notification_actions(GtkWindow *nw);
@@ -76,19 +76,19 @@
+gboolean theme_get_always_stack(GtkWindow *nw);
#endif /* _ENGINES_H_ */
-Index: notification-daemon-0.3.7/src/themes/Makefile.am
+Index: notification-daemon-0.4.0/src/themes/Makefile.am
===================================================================
---- notification-daemon-0.3.7.orig/src/themes/Makefile.am
-+++ notification-daemon-0.3.7/src/themes/Makefile.am
+--- notification-daemon-0.4.0.orig/src/themes/Makefile.am
++++ notification-daemon-0.4.0/src/themes/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = standard
+SUBDIRS = standard newbubble
DIST_SUBDIRS = $(SUBDIRS) bubble
-Index: notification-daemon-0.3.7/src/themes/newbubble/theme.c
+Index: notification-daemon-0.4.0/src/themes/newbubble/theme.c
===================================================================
---- notification-daemon-0.3.7.orig/src/themes/newbubble/theme.c
-+++ notification-daemon-0.3.7/src/themes/newbubble/theme.c
-@@ -609,6 +609,7 @@ create_notification(UrlClickedCb url_cli
+--- notification-daemon-0.4.0.orig/src/themes/newbubble/theme.c
++++ notification-daemon-0.4.0/src/themes/newbubble/theme.c
+@@ -606,6 +606,7 @@ create_notification(UrlClickedCb url_cli
gtk_window_set_type_hint(GTK_WINDOW(win),
GDK_WINDOW_TYPE_HINT_NOTIFICATION);
gtk_widget_add_events(win, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
@@ -96,7 +96,7 @@
gtk_widget_realize(win);
gtk_widget_set_size_request(win, WIDTH, -1);
-@@ -1015,7 +1016,7 @@ get_theme_info(char **theme_name,
+@@ -1028,7 +1029,7 @@ get_theme_info(char **theme_name,
char **author,
char **homepage)
{
@@ -105,7 +105,7 @@
*theme_ver = g_strdup_printf("%d.%d.%d",
NOTIFICATION_DAEMON_MAJOR_VERSION,
NOTIFICATION_DAEMON_MINOR_VERSION,
-@@ -1032,3 +1033,9 @@ theme_check_init(unsigned int major_ver,
+@@ -1045,3 +1046,9 @@ theme_check_init(unsigned int major_ver,
minor_ver == NOTIFICATION_DAEMON_MINOR_VERSION &&
micro_ver == NOTIFICATION_DAEMON_MICRO_VERSION;
}
@@ -115,12 +115,12 @@
+{
+ return TRUE;
+}
-Index: notification-daemon-0.3.7/configure.ac
+Index: notification-daemon-0.4.0/configure.ac
===================================================================
---- notification-daemon-0.3.7.orig/configure.ac
-+++ notification-daemon-0.3.7/configure.ac
-@@ -201,6 +201,7 @@ src/Makefile
- src/daemon/Makefile
+--- notification-daemon-0.4.0.orig/configure.ac
++++ notification-daemon-0.4.0/configure.ac
+@@ -206,6 +206,7 @@ src/daemon/Makefile
+ src/capplet/Makefile
src/themes/Makefile
src/themes/bubble/Makefile
+src/themes/newbubble/Makefile
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org