Hello community, here is the log from the commit of package ekiga for openSUSE:Factory checked in at Tue May 3 13:34:01 CEST 2011.
-------- --- ekiga/ekiga.changes 2011-02-13 17:21:45.000000000 +0100 +++ ekiga/ekiga.changes 2011-04-08 08:28:20.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 8 06:27:48 UTC 2011 - [email protected] + +- Add ekiga-libnotify07.patch: fix build with libnotify 0.7. Patch + taken from upstream git, commit 6a964b. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ekiga-3.2.7.tar.bz2 New: ---- ekiga-libnotify07.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ekiga.spec ++++++ --- /var/tmp/diff_new_pack.wLyoqX/_old 2011-05-03 13:32:18.000000000 +0200 +++ /var/tmp/diff_new_pack.wLyoqX/_new 2011-05-03 13:32:18.000000000 +0200 @@ -22,12 +22,14 @@ License: GPLv2+ Group: Productivity/Telephony/SIP/Clients Version: 3.2.7 -Release: 3 +Release: 11 Summary: A GNOME based SIP/H323 teleconferencing application Url: http://www.ekiga.org/ Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM ekiga-libnotify_gtk.patch [email protected] -- Fixes build with new libnotify versions. No need to submit upstream since in trunk they changed the build system and indirectly fixed the problem. Patch0: ekiga-libnotify_gtk.patch +# PATCH-FIX-UPSTREAM ekiga-libnotify07.patch bgo#632848 [email protected] -- Fix build with libnotify 0.7 +Patch1: ekiga-libnotify07.patch BuildRequires: evolution-data-server-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -63,6 +65,7 @@ %prep %setup -q %patch0 +%patch1 -p1 translation-update-upstream %build ++++++ ekiga-libnotify07.patch ++++++ >From 6a964b0889fbdb164a036649c4aea1cc3c9818e3 Mon Sep 17 00:00:00 2001 From: Flo Gravo <[email protected]> Date: Thu, 04 Nov 2010 20:36:50 +0000 Subject: Update to the new libnotify 0.7.0 library Fixes bug #632848. --- (limited to 'lib/engine/components/libnotify/libnotify-main.cpp') diff --git a/lib/engine/components/libnotify/libnotify-main.cpp b/lib/engine/components/libnotify/libnotify-main.cpp index 54ea259..26049f3 100644 --- a/lib/engine/components/libnotify/libnotify-main.cpp +++ b/lib/engine/components/libnotify/libnotify-main.cpp @@ -158,7 +158,16 @@ LibNotify::on_notification_added (boost::shared_ptr<Ekiga::Notification> notific notif = notify_notification_new (notification->get_title ().c_str (), notification->get_body ().c_str (), - urgency, NULL); + urgency +// NOTIFY_CHECK_VERSION appeared in 0.5.2 only +#ifdef NOTIFY_CHECK_VERSION +#if !NOTIFY_CHECK_VERSION(0,7,0) + , NULL +#endif +#else + , NULL +#endif + ); g_signal_connect (notif, "closed", G_CALLBACK (on_notif_closed), notification.get ()); -- cgit v0.9 >From 6a964b0889fbdb164a036649c4aea1cc3c9818e3 Mon Sep 17 00:00:00 2001 From: Flo Gravo <[email protected]> Date: Thu, 04 Nov 2010 20:36:50 +0000 Subject: Update to the new libnotify 0.7.0 library Fixes bug #632848. --- (limited to 'src/gui/main_window.cpp') diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp index d5b1467..ffa864b 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -2862,12 +2862,29 @@ ekiga_main_window_incoming_call_notify (EkigaMainWindow *mw, body = g_strdup_printf ("%s\n%s\n%s", uri, app, account); - notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL); + + notify = notify_notification_new (title, body, GM_ICON_LOGO +// NOTIFY_CHECK_VERSION appeared in 0.5.2 only +#ifndef NOTIFY_CHECK_VERSION + , NULL +#else +#if !NOTIFY_CHECK_VERSION(0,7,0) + , NULL +#endif +#endif + ); notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL); notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL); notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER); notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL); - notify_notification_attach_to_status_icon (notify, statusicon); +// NOTIFY_CHECK_VERSION appeared in 0.5.2 only +#ifndef NOTIFY_CHECK_VERSION + notify_notification_attach_to_status_icon (notify, statusicon); +#else +#if !NOTIFY_CHECK_VERSION(0,7,0) + notify_notification_attach_to_status_icon (notify, statusicon); +#endif +#endif if (!notify_notification_show (notify, NULL)) { ekiga_main_window_incoming_call_dialog_show (mw, call); } -- cgit v0.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
