Hello community, here is the log from the commit of package evolution-tray for openSUSE:Factory checked in at 2013-09-09 09:52:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-tray (Old) and /work/SRC/openSUSE:Factory/.evolution-tray.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution-tray" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-tray/evolution-tray.changes 2013-04-14 10:13:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.evolution-tray.new/evolution-tray.changes 2013-09-09 09:52:51.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 5 07:10:45 UTC 2013 - [email protected] + +- Add evolution-tray-evo-3.10.patch: Fix build with evolution 3.10. + +------------------------------------------------------------------- New: ---- evolution-tray-evo-3.10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-tray.spec ++++++ --- /var/tmp/diff_new_pack.Ui7Hk0/_old 2013-09-09 09:52:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Ui7Hk0/_new 2013-09-09 09:52:52.000000000 +0200 @@ -36,6 +36,8 @@ Patch4: evolution-tray-evo-3.6.patch # PATCH-FIX-UPSTREAM evolution-tray-evo-3.8.patch [email protected] -- Fix build with evolution 3.8. Taken from git. Patch5: evolution-tray-evo-3.8.patch +# PATCH-FIX-UPSTREAM evolution-tray-evo-3.10.patch [email protected] -- Fix build with evolution 3.10. +Patch6: evolution-tray-evo-3.10.patch # needed for patch1 and patch3 BuildRequires: gnome-common BuildRequires: intltool @@ -63,6 +65,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build # needed for patch1 and patch3 ++++++ evolution-tray-evo-3.10.patch ++++++ Index: evolution-tray-0.0.8/src/tray.c =================================================================== --- evolution-tray-0.0.8.orig/src/tray.c +++ evolution-tray-0.0.8/src/tray.c @@ -80,7 +80,9 @@ #include <mail/e-mail-reader.h> #endif +#if (EVOLUTION_VERSION < 30905) #include <shell/es-event.h> +#endif #ifdef HAVE_LIBNOTIFY #include <libnotify/notify.h> @@ -1332,6 +1334,7 @@ org_gnome_evolution_tray_startup( void *ep, EMPopupTargetSelect *t) #else +#if (EVOLUTION_VERSION < 30905) void org_gnome_evolution_tray_startup( void *ep, @@ -1341,6 +1344,17 @@ void org_gnome_evolution_tray_startup( void *ep, ESEventTargetUpgrade *t) +#else + +me_evolution_tray_startup( + void *ep, + void *t); + +void +org_gnome_evolution_tray_startup( + void *ep, + void *t) +#endif #endif { g_print("Evolution-tray plugin enabled.\n"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
