Hello community, here is the log from the commit of package notification-daemon checked in at Mon Nov 3 14:10:55 CET 2008. -------- --- GNOME/notification-daemon/notification-daemon.changes 2008-03-31 14:43:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/notification-daemon/notification-daemon.changes 2008-10-28 02:42:14.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Oct 28 00:40:15 CET 2008 - vuntz@novell.com + +- Add notification-daemon-svn3017.patch to get many fixes from + upstream that never made into a release since early 2007. +- Add notification-daemon-memleak.patch to fix a leak. +- Add gstreamer-0_10-devel as BuildRequires. +- Clean up spec file. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- notification-daemon-clipping.patch notification-daemon-memleak.patch notification-daemon-svn3017.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notification-daemon.spec ++++++ --- /var/tmp/diff_new_pack.v25916/_old 2008-11-03 14:10:00.000000000 +0100 +++ /var/tmp/diff_new_pack.v25916/_new 2008-11-03 14:10:00.000000000 +0100 @@ -2,9 +2,16 @@ # spec file for package notification-daemon (Version 0.3.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,21 +19,28 @@ Name: notification-daemon -BuildRequires: fdupes gconf2-devel intltool libsexy-devel libwnck-devel -%if %suse_version > 1010 BuildRequires: dbus-1-glib-devel -%else -BuildRequires: dbus-1-devel dbus-1-glib -%endif +BuildRequires: fdupes +BuildRequires: gconf2-devel +BuildRequires: gstreamer-0_10-devel +BuildRequires: intltool +BuildRequires: libsexy-devel +BuildRequires: libwnck-devel Version: 0.3.7 -Release: 122 +Release: 185 Url: http://www.galago-project.org/ Group: System/Daemons License: GPL v2 or later Summary: Notification Daemon Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM notification-daemon-svn3017.patch vuntz@novell.com -- Get a bunch of fix from upstream svn. There are many fixes committed upstream and there was no relase since early 2007. The patch explicitly doesn't contain the new capplet stuff. +Patch0: notification-daemon-svn3017.patch +# PATCH-FIX-UPSTREAM notification-daemon-memleak.patch vuntz@novell.com -- Fix a memory leak, patch from Ubuntu. +Patch1: notification-daemon-memleak.patch +# PATCH-FIX-UPSTREAM notification-daemon-clipping.patch vuntz@novell.com -- Fix clipping, http://trac.galago-project.org/ticket/162 +Patch2: notification-daemon-clipping.patch # PATCH-FEATURE-OPENSUSE notification-daemon-new-bubble.patch vuntz@novell.com -- Patch a new standard-based theme to be compliant with our policy. -Patch: notification-daemon-new-bubble.patch +Patch10: notification-daemon-new-bubble.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Requires: %{name}-lang = %{version} @@ -44,10 +58,13 @@ %lang_package %prep %setup -q +%patch0 -p0 +%patch1 -p0 +%patch2 -p1 # We create a new bubble theme based on the standard theme cp -a src/themes/standard src/themes/newbubble sed -i "s/libstandard/libbubble/g" src/themes/newbubble/Makefile* -%patch -p1 +%patch10 -p1 %build autoreconf -f -i @@ -88,6 +105,12 @@ %files lang -f %{name}.lang %changelog +* Tue Oct 28 2008 vuntz@novell.com +- Add notification-daemon-svn3017.patch to get many fixes from + upstream that never made into a release since early 2007. +- Add notification-daemon-memleak.patch to fix a leak. +- Add gstreamer-0_10-devel as BuildRequires. +- Clean up spec file. * Mon Mar 31 2008 vuntz@suse.de - Remove all the bubble related patches: notification-daemon-bubble-enable.patch, @@ -109,7 +132,7 @@ * Wed Aug 08 2007 maw@suse.de - Use %%fdupes - Split off a -lang subpackage. -* Wed Mar 14 2007 dobey@suse.de +* Tue Mar 13 2007 dobey@suse.de - Update drawing patch to build - notification-daemon-bubble-enable.patch * Enable building the bubble theme again @@ -167,7 +190,7 @@ org.freedesktop.Notifications.service * Wed Aug 16 2006 aj@suse.de - Add a build require on dbus-1-glib-devel. -* Wed Mar 15 2006 dobey@suse.de +* Tue Mar 14 2006 dobey@suse.de - Add patch to fix default action clicking in notifications * Mon Mar 06 2006 dobey@suse.de - Update drawing patch to fix colors ++++++ notification-daemon-clipping.patch ++++++ Index: notification-daemon-0.3.7/src/themes/standard/theme.c =================================================================== --- notification-daemon-0.3.7.orig/src/themes/standard/theme.c +++ notification-daemon-0.3.7/src/themes/standard/theme.c @@ -16,6 +16,7 @@ typedef struct GtkWidget *icon; GtkWidget *content_hbox; GtkWidget *summary_label; + GtkWidget *close_button; GtkWidget *body_label; GtkWidget *actions_box; GtkWidget *last_sep; @@ -683,6 +684,7 @@ create_notification(UrlClickedCb url_cli gtk_box_pack_start(GTK_BOX(hbox), alignment, FALSE, FALSE, 0); close_button = gtk_button_new(); + windata->close_button = close_button; gtk_widget_show(close_button); gtk_container_add(GTK_CONTAINER(alignment), close_button); gtk_button_set_relief(GTK_BUTTON(close_button), GTK_RELIEF_NONE); @@ -792,6 +794,7 @@ void set_notification_text(GtkWindow *nw, const char *summary, const char *body) { char *str, *quoted; + GtkRequisition req; WindowData *windata = g_object_get_data(G_OBJECT(nw), "windata"); g_assert(windata != NULL); @@ -811,10 +814,24 @@ set_notification_text(GtkWindow *nw, con update_content_hbox_visibility(windata); + if (body != NULL && *body != '\0') + { + gtk_widget_size_request (windata->iconbox, &req); + gtk_widget_set_size_request( + windata->body_label, + /* -1: border width for + -6: spacing for hbox */ + WIDTH - (1*2) - (10*2) - req.width - 6, + -1); + } + + gtk_widget_size_request (windata->close_button, &req); gtk_widget_set_size_request( - ((body != NULL && *body == '\0') - ? windata->body_label : windata->summary_label), - WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10, + windata->summary_label, + /* -1: main_vbox border width + -10: vbox border width + -6: spacing for hbox */ + WIDTH - (1*2) - (10*2) - SPACER_LEFT - req.width - (6*2), -1); } ++++++ notification-daemon-memleak.patch ++++++ diff -Nur -x '*.orig' -x '*~' src/daemon/daemon.c src/daemon/daemon.c --- src/daemon/daemon.c 2008-05-26 10:50:52.000000000 +0200 +++ src/daemon/daemon.c 2008-05-26 10:55:19.000000000 +0200 @@ -763,8 +763,7 @@ } if (temp_data != NULL) - free(temp_data); - + XFree(temp_data); return active; } ++++++ notification-daemon-new-bubble.patch ++++++ --- /var/tmp/diff_new_pack.v25916/_old 2008-11-03 14:10:00.000000000 +0100 +++ /var/tmp/diff_new_pack.v25916/_new 2008-11-03 14:10:00.000000000 +0100 @@ -17,33 +17,24 @@ widget "notification-window.GtkEventBox.GtkVBox" style "notification-magic" -diff -aur notification-daemon-0.3.7/configure.ac notification-daemon-0.3.7-patched//configure.ac ---- notification-daemon-0.3.7/configure.ac 2007-02-28 06:16:16.000000000 +0100 -+++ notification-daemon-0.3.7-patched//configure.ac 2008-03-27 00:14:45.000000000 +0100 -@@ -173,6 +173,7 @@ - src/daemon/Makefile - src/themes/Makefile - src/themes/bubble/Makefile -+src/themes/newbubble/Makefile - src/themes/standard/Makefile - ]) - -diff -aur notification-daemon-0.3.7/src/daemon/daemon.c notification-daemon-0.3.7-patched//src/daemon/daemon.c ---- notification-daemon-0.3.7/src/daemon/daemon.c 2007-02-15 11:47:09.000000000 +0100 -+++ notification-daemon-0.3.7-patched//src/daemon/daemon.c 2008-03-27 01:20:42.000000000 +0100 -@@ -957,7 +957,7 @@ - } +Index: notification-daemon-0.3.7/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 + * sync_notification_position later. + */ } - -- if (use_pos_data) -+ if (use_pos_data && !theme_get_always_stack(nw)) +- else if (use_pos_data) ++ else if (use_pos_data && !theme_get_always_stack(nw)) { /* * Typically, the theme engine will set its own position based on -diff -aur notification-daemon-0.3.7/src/daemon/engines.c notification-daemon-0.3.7-patched//src/daemon/engines.c ---- notification-daemon-0.3.7/src/daemon/engines.c 2007-02-28 08:18:48.000000000 +0100 -+++ notification-daemon-0.3.7-patched//src/daemon/engines.c 2008-03-27 01:31:04.000000000 +0100 -@@ -30,6 +30,7 @@ +Index: notification-daemon-0.3.7/src/daemon/engines.c +=================================================================== +--- notification-daemon-0.3.7.orig/src/daemon/engines.c ++++ notification-daemon-0.3.7/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); void (*notification_tick)(GtkWindow *nw, glong timeout); @@ -51,7 +42,7 @@ } ThemeEngine; -@@ -83,6 +84,7 @@ +@@ -83,6 +84,7 @@ load_theme_engine(const char *name) BIND_OPTIONAL_FUNC(set_notification_timeout); BIND_OPTIONAL_FUNC(set_notification_hints); BIND_OPTIONAL_FUNC(notification_tick); @@ -59,7 +50,7 @@ if (!engine->theme_check_init(NOTIFICATION_DAEMON_MAJOR_VERSION, NOTIFICATION_DAEMON_MINOR_VERSION, -@@ -293,3 +295,14 @@ +@@ -293,3 +295,14 @@ theme_move_notification(GtkWindow *nw, i ThemeEngine *engine = g_object_get_data(G_OBJECT(nw), "_theme_engine"); engine->move_notification(nw, x, y); } @@ -74,35 +65,38 @@ + else + return FALSE; +} -diff -aur notification-daemon-0.3.7/src/daemon/engines.h notification-daemon-0.3.7-patched//src/daemon/engines.h ---- notification-daemon-0.3.7/src/daemon/engines.h 2006-10-08 23:02:37.000000000 +0200 -+++ notification-daemon-0.3.7-patched//src/daemon/engines.h 2008-03-27 01:20:14.000000000 +0100 -@@ -21,5 +21,6 @@ +Index: notification-daemon-0.3.7/src/daemon/engines.h +=================================================================== +--- notification-daemon-0.3.7.orig/src/daemon/engines.h ++++ notification-daemon-0.3.7/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); void theme_move_notification(GtkWindow *nw, int x, int y); +gboolean theme_get_always_stack(GtkWindow *nw); #endif /* _ENGINES_H_ */ -diff -aur notification-daemon-0.3.7/src/themes/Makefile.am notification-daemon-0.3.7-patched//src/themes/Makefile.am ---- notification-daemon-0.3.7/src/themes/Makefile.am 2006-10-08 23:04:02.000000000 +0200 -+++ notification-daemon-0.3.7-patched//src/themes/Makefile.am 2008-03-27 00:10:13.000000000 +0100 +Index: notification-daemon-0.3.7/src/themes/Makefile.am +=================================================================== +--- notification-daemon-0.3.7.orig/src/themes/Makefile.am ++++ notification-daemon-0.3.7/src/themes/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = standard +SUBDIRS = standard newbubble DIST_SUBDIRS = $(SUBDIRS) bubble -diff -aur notification-daemon-0.3.7/src/themes/newbubble/theme.c notification-daemon-0.3.7-patched//src/themes/newbubble/theme.c ---- notification-daemon-0.3.7/src/themes/newbubble/theme.c 2007-01-26 05:20:15.000000000 +0100 -+++ notification-daemon-0.3.7-patched//src/themes/newbubble/theme.c 2008-03-26 23:42:57.000000000 +0100 -@@ -693,6 +693,7 @@ - - gtk_window_set_title(GTK_WINDOW(win), "Notification"); +Index: notification-daemon-0.3.7/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 + 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); + gtk_widget_set_name(win, "notification-window"); gtk_widget_realize(win); gtk_widget_set_size_request(win, WIDTH, -1); -@@ -1100,7 +1101,7 @@ +@@ -1015,7 +1016,7 @@ get_theme_info(char **theme_name, char **author, char **homepage) { @@ -111,7 +105,7 @@ *theme_ver = g_strdup_printf("%d.%d.%d", NOTIFICATION_DAEMON_MAJOR_VERSION, NOTIFICATION_DAEMON_MINOR_VERSION, -@@ -1117,3 +1118,9 @@ +@@ -1032,3 +1033,9 @@ theme_check_init(unsigned int major_ver, minor_ver == NOTIFICATION_DAEMON_MINOR_VERSION && micro_ver == NOTIFICATION_DAEMON_MICRO_VERSION; } @@ -121,3 +115,15 @@ +{ + return TRUE; +} +Index: notification-daemon-0.3.7/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 + src/themes/Makefile + src/themes/bubble/Makefile ++src/themes/newbubble/Makefile + src/themes/standard/Makefile + ]) + ++++++ notification-daemon-svn3017.patch ++++++ ++++ 1790 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org