commit evolution-tray for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.evolution-tray.new/evolution-tray.changes
2013-09-09 09:52:51.0 +0200
@@ -1,0 +2,5 @@
+Thu Sep 5 07:10:45 UTC 2013 - dims...@opensuse.org
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.Ui7Hk0/_new 2013-09-09 09:52:52.0 +0200
@@ -36,6 +36,8 @@
Patch4: evolution-tray-evo-3.6.patch
# PATCH-FIX-UPSTREAM evolution-tray-evo-3.8.patch dims...@opensuse.org -- 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 dims...@opensuse.org -- 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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit evolution-tray for openSUSE:Factory
Hello community, here is the log from the commit of package evolution-tray for openSUSE:Factory checked in at 2013-04-14 10:13:50 Comparing /work/SRC/openSUSE:Factory/evolution-tray (Old) and /work/SRC/openSUSE:Factory/.evolution-tray.new (New) Package is evolution-tray, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/evolution-tray/evolution-tray.changes 2012-10-16 07:00:21.0 +0200 +++ /work/SRC/openSUSE:Factory/.evolution-tray.new/evolution-tray.changes 2013-04-14 10:13:52.0 +0200 @@ -1,0 +2,5 @@ +Sat Apr 13 14:38:04 UTC 2013 - dims...@opensuse.org + +- Add evolution-tray-evo-3.8.patch: Fix build with evolution 3.8. + +--- New: evolution-tray-evo-3.8.patch Other differences: -- ++ evolution-tray.spec ++ --- /var/tmp/diff_new_pack.dObpi2/_old 2013-04-14 10:13:54.0 +0200 +++ /var/tmp/diff_new_pack.dObpi2/_new 2013-04-14 10:13:54.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package evolution-tray # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,8 @@ Patch3: evolution-tray-gconf.patch # PATCH-FIX-UPSTREAM evolution-tray-evo-3.6.patch dims...@opensuse.org -- Fix build with evolution 3.6. Taken from git. Patch4: evolution-tray-evo-3.6.patch +# PATCH-FIX-UPSTREAM evolution-tray-evo-3.8.patch dims...@opensuse.org -- Fix build with evolution 3.8. Taken from git. +Patch5: evolution-tray-evo-3.8.patch # needed for patch1 and patch3 BuildRequires: gnome-common BuildRequires: intltool @@ -60,6 +62,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build # needed for patch1 and patch3 ++ evolution-tray-evo-3.8.patch ++ From 915b7a176fe1b15b47dba9a4f53938abcb3acb17 Mon Sep 17 00:00:00 2001 From: Lucian Langa lucila...@gnome.org Date: Wed, 06 Feb 2013 17:43:37 + Subject: adapt to evo e-util changes --- diff --git a/src/tray.c b/src/tray.c index f052f37..8760976 100644 --- a/src/tray.c +++ b/src/tray.c @@ -37,7 +37,13 @@ #endif #endif +#if EVOLUTION_VERSION 30704 #include e-util/e-config.h +#include e-util/e-plugin.h +#include e-util/e-icon-factory.h +#else +#include e-util/e-util.h +#endif #if EVOLUTION_VERSION 22900 #include mail/em-popup.h @@ -66,7 +72,6 @@ #else #include mail/mail-ops.h #endif -#include e-util/e-plugin.h #include mail/em-event.h #include mail/em-folder-tree.h @@ -75,7 +80,6 @@ #include mail/e-mail-reader.h #endif -#include e-util/e-icon-factory.h #include shell/es-event.h #ifdef HAVE_LIBNOTIFY -- cgit v0.9.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit evolution-tray for openSUSE:Factory
Hello community,
here is the log from the commit of package evolution-tray for openSUSE:Factory
checked in at 2012-10-16 07:00:19
Comparing /work/SRC/openSUSE:Factory/evolution-tray (Old)
and /work/SRC/openSUSE:Factory/.evolution-tray.new (New)
Package is evolution-tray, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/evolution-tray/evolution-tray.changes
2012-03-01 17:19:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.evolution-tray.new/evolution-tray.changes
2012-10-16 07:00:21.0 +0200
@@ -1,0 +2,8 @@
+Sat Oct 13 13:47:53 UTC 2012 - dims...@opensuse.org
+
+- Add evolution-tray-evo-3.6.patch: Fix build with evolution 3.6
+- Add evolution-tray-gconf.patch: Take care of linking to GConf by
+ ourselves. We can no longer rely on other code bringing it in
+ for us.
+
+---
New:
evolution-tray-evo-3.6.patch
evolution-tray-gconf.patch
Other differences:
--
++ evolution-tray.spec ++
--- /var/tmp/diff_new_pack.EIKNBq/_old 2012-10-16 07:00:25.0 +0200
+++ /var/tmp/diff_new_pack.EIKNBq/_new 2012-10-16 07:00:25.0 +0200
@@ -30,11 +30,16 @@
Patch1: evolution-tray-git-00c08ae8.patch
# PATCH-FIX-UPSTREAM evolution-tray-evo-3.4.patch vu...@opensuse.org -- Fix
build with latest evo 3.3.x; sent upstream by mail
Patch2: evolution-tray-evo-3.4.patch
-# needed for patch1
+# PATCH-FIX-UPSTREAM evolution-tray-gconf.patch dims...@opensuse.org -- Link
against gconf; sent upstream by mail
+Patch3: evolution-tray-gconf.patch
+# PATCH-FIX-UPSTREAM evolution-tray-evo-3.6.patch dims...@opensuse.org -- Fix
build with evolution 3.6. Taken from git.
+Patch4: evolution-tray-evo-3.6.patch
+# needed for patch1 and patch3
BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: pkgconfig(evolution-plugin-3.0)
BuildRequires: pkgconfig(evolution-shell-3.0)
+BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libnotify)
Requires: evolution
@@ -53,9 +58,11 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
-# needed for patch1
+# needed for patch1 and patch3
NOCONFIGURE=1 gnome-autogen.sh
%configure
%__make %{?_smp_mflags} V=1
++ evolution-tray-evo-3.6.patch ++
From 618d19db37588fcc007869943a2fe4041bb0882c Mon Sep 17 00:00:00 2001
From: Lucian Langa lucila...@gnome.org
Date: Tue, 03 Jul 2012 00:12:47 +
Subject: adapt to latest evolution changes
---
diff --git a/src/tray.c b/src/tray.c
index a35995c..4f9a4fb 100644
--- a/src/tray.c
+++ b/src/tray.c
@@ -25,7 +25,10 @@
#include glib/gi18n.h
#include string.h
+#if EVOLUTION_VERSION = 30503
#include gconf/gconf-client.h
+#endif
+
#if EVOLUTION_VERSION 30304
#ifdef HAVE_LIBGCONFBRIDGE
#include libgconf-bridge/gconf-bridge.h
@@ -43,6 +46,7 @@
#include shell/e-shell-view.h
#include shell/e-shell-window.h
#endif
+#if EVOLUTION_VERSION = 30501
#if EVOLUTION_VERSION = 30305
#include libemail-utils/e-account-utils.h
#include mail/e-mail.h
@@ -55,6 +59,7 @@
#include mail/mail-session.h
#endif
#endif
+#endif
#if EVOLUTION_VERSION = 30305
#include libemail-engine/e-mail-folder-utils.h
#include libemail-engine/mail-ops.h
@@ -66,6 +71,9 @@
#include mail/em-event.h
#include mail/em-folder-tree.h
+#if EVOLUTION_VERSION 30501
+#include mail/e-mail-reader.h
+#endif
#include e-util/e-icon-factory.h
#include shell/es-event.h
@@ -225,12 +233,13 @@ toggled_hidde_on_minimize_cb (GtkWidget *widget, gpointer
data)
#define GCONF_KEY_SOUND_BEEPGCONF_KEY_NOTIF_ROOT sound-beep
#define GCONF_KEY_SOUND_USE_THEME GCONF_KEY_NOTIF_ROOT sound-use-theme
#define GCONF_KEY_SOUND_PLAY_FILE GCONF_KEY_NOTIF_ROOT sound-play-file
+#define GCONF_KEY_SOUND_FILEGCONF_KEY_NOTIF_ROOT sound-file
#else
#define CONF_KEY_SOUND_BEEPnotify-sound-beep
#define CONF_KEY_SOUND_USE_THEME notify-sound-use-theme
#define CONF_KEY_SOUND_PLAY_FILE notify-sound-play-file
+#define CONF_KEY_SOUND_FILEnotify-sound-file
#endif
-#define GCONF_KEY_SOUND_FILEGCONF_KEY_NOTIF_ROOT sound-file
static void
do_play_sound (gboolean beep, gboolean use_theme, const gchar *file)
@@ -264,16 +273,33 @@ static void
sound_file_set_cb (GtkWidget *widget, gpointer data)
{
gchar *file;
+#if EVOLUTION_VERSION 30304
GConfClient *client;
+#else
+ GSettings *settings;
+#endif
g_return_if_fail (widget != NULL);
+#if EVOLUTION_VERSION 30304
client = gconf_client_get_default ();
+#else
+ settings = g_settings_new
(org.gnome.evolution.plugin.mail-notification);
+#endif
+
file =
commit evolution-tray for openSUSE:Factory
Hello community,
here is the log from the commit of package evolution-tray for openSUSE:Factory
checked in at 2012-03-01 17:19:34
Comparing /work/SRC/openSUSE:Factory/evolution-tray (Old)
and /work/SRC/openSUSE:Factory/.evolution-tray.new (New)
Package is evolution-tray, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/evolution-tray/evolution-tray.changes
2011-10-02 10:00:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.evolution-tray.new/evolution-tray.changes
2012-03-01 17:19:36.0 +0100
@@ -1,0 +2,16 @@
+Wed Feb 29 07:46:17 UTC 2012 - vu...@opensuse.org
+
+- Add evolution-tray-git-00c08ae8.patch: update to current git
+ (last commit from January 21), to update the code to work with
+ evolution 3.4 and get build fixes.
+- This patch brings the following changes:
+ + Add minimize to tray ability.
+ + Port to GSettings, following evolution changes.
+ + Build fixes.
+- Add evolution-tray-evo-3.4.patch: additional fixes for latest
+ evolution 3.3.x.
+- Add gnome-common BuildRequires and call to gnome-autogen.sh,
+ needed for evolution-tray-git-00c08ae8.patch.
+- Use %glib2_gsettings_schema_* macros.
+
+---
New:
evolution-tray-evo-3.4.patch
evolution-tray-git-00c08ae8.patch
Other differences:
--
++ evolution-tray.spec ++
--- /var/tmp/diff_new_pack.uW6RfV/_old 2012-03-01 17:19:37.0 +0100
+++ /var/tmp/diff_new_pack.uW6RfV/_new 2012-03-01 17:19:37.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package evolution-tray
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,22 @@
#
-
Name: evolution-tray
Version:0.0.8
-Release:1
-License:GPL-2.0+
+Release:0
Summary:Evolution plugin to minimize in tray
-Url:http://gnome.eu.org/evo/index.php/Evolution_Tray
+License:GPL-2.0+
Group: Productivity/Office/Other
+Url:http://gnome.eu.org/evo/index.php/Evolution_Tray
Source0:http://gnome.eu.org/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM evolution-tray-fix-include.patch vu...@opensuse.org --
Add missing include; sent upstream by mail
Patch0: evolution-tray-fix-include.patch
+# PATCH-FIX-UPSTREAM evolution-tray-git-00c08ae8.patch vu...@opensuse.org --
Update to latest git
+Patch1: evolution-tray-git-00c08ae8.patch
+# PATCH-FIX-UPSTREAM evolution-tray-evo-3.4.patch vu...@opensuse.org -- Fix
build with latest evo 3.3.x; sent upstream by mail
+Patch2: evolution-tray-evo-3.4.patch
+# needed for patch1
+BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: pkgconfig(evolution-plugin-3.0)
BuildRequires: pkgconfig(evolution-shell-3.0)
@@ -35,6 +40,7 @@
Requires: evolution
Enhances: evolution
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%glib2_gsettings_schema_requires
%description
This plugin is useful when you want to put evolution in the tray
@@ -45,8 +51,12 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
+# needed for patch1
+NOCONFIGURE=1 gnome-autogen.sh
%configure
%__make %{?_smp_mflags} V=1
@@ -54,9 +64,17 @@
%makeinstall
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+%post
+%glib2_gsettings_schema_post
+
+%postun
+%glib2_gsettings_schema_postun
+
%files
%defattr(-,root,root)
%doc AUTHORS COPYING
+%{_datadir}/GConf/gsettings/evolution-tray.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.evolution-tray.gschema.xml
%{_libdir}/evolution/*/plugins/liborg-gnome-evolution-tray.so
%{_libdir}/evolution/*/plugins/org-gnome-evolution-tray.eplug
++ evolution-tray-evo-3.4.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
@@ -43,6 +43,10 @@
#include shell/e-shell-view.h
#include shell/e-shell-window.h
#endif
+#if EVOLUTION_VERSION = 30305
+#include libemail-utils/e-account-utils.h
+#include mail/e-mail.h
+#else
#if EVOLUTION_VERSION = 29101
#include e-util/e-account-utils.h
#include mail/e-mail.h
@@ -50,7 +54,13 @@
#include mail/mail-config.h
#include mail/mail-session.h
#endif
+#endif
+#if EVOLUTION_VERSION = 30305
+#include libemail-engine/e-mail-folder-utils.h
+#include libemail-engine/mail-ops.h
+#else
#include mail/mail-ops.h
+#endif
#include e-util/e-plugin.h
#include mail/em-event.h
commit evolution-tray for openSUSE:Factory
Hello community, here is the log from the commit of package evolution-tray for openSUSE:Factory checked in at 2011-12-06 18:08:37 Comparing /work/SRC/openSUSE:Factory/evolution-tray (Old) and /work/SRC/openSUSE:Factory/.evolution-tray.new (New) Package is evolution-tray, Maintainer is Changes: Other differences: -- ++ evolution-tray.spec ++ --- /var/tmp/diff_new_pack.WO84yI/_old 2011-12-06 18:14:04.0 +0100 +++ /var/tmp/diff_new_pack.WO84yI/_new 2011-12-06 18:14:04.0 +0100 @@ -20,7 +20,7 @@ Name: evolution-tray Version:0.0.8 Release:1 -License:GPLv2+ +License:GPL-2.0+ Summary:Evolution plugin to minimize in tray Url:http://gnome.eu.org/evo/index.php/Evolution_Tray Group: Productivity/Office/Other -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit evolution-tray for openSUSE:Factory
Hello community,
here is the log from the commit of package evolution-tray for openSUSE:Factory
checked in at Mon Sep 19 21:37:25 CEST 2011.
--- GNOME/evolution-tray/evolution-tray.changes 2011-08-10 22:27:55.0
+0200
+++ /mounts/work_src_done/STABLE/evolution-tray/evolution-tray.changes
2011-09-09 16:23:59.0 +0200
@@ -1,0 +2,15 @@
+Fri Sep 9 13:52:32 UTC 2011 - vu...@opensuse.org
+
+- Update to version 0.0.8:
+ + Fix build with latest GTK+ and evolution.
+ + Fix displaying of popup menu.
+- Drop evolution-tray-gnome3.patch,
+ evolution-tray-gnome3-bis.patch, evolution-tray-gnome3-ter.patch:
+ all fixed upstream.
+- Drop gnome-common BuildRequires and call to gnome-autogen.sh:
+ those were needed for the patches.
+- Drop usage of favor_gtk2: the upstream code moved to GTK+ 3 only.
+- Add evolution-tray-fix-include.patch: add missing include to fix
+ build.
+
+---
Package does not exist at destination yet. Using Fallback GNOME/evolution-tray
Destination is evolution-tray
calling whatdependson for head-i586
Old:
evolution-tray-0.0.7.tar.bz2
evolution-tray-gnome3-bis.patch
evolution-tray-gnome3-ter.patch
evolution-tray-gnome3.patch
New:
evolution-tray-0.0.8.tar.gz
evolution-tray-fix-include.patch
Other differences:
--
++ evolution-tray.spec ++
--- /var/tmp/diff_new_pack.LCn18n/_old 2011-09-19 21:37:17.0 +0200
+++ /var/tmp/diff_new_pack.LCn18n/_new 2011-09-19 21:37:17.0 +0200
@@ -18,31 +18,19 @@
Name: evolution-tray
-Version:0.0.7
-Release:7
+Version:0.0.8
+Release:1
License:GPLv2+
Summary:Evolution plugin to minimize in tray
Url:http://gnome.eu.org/evo/index.php/Evolution_Tray
Group: Productivity/Office/Other
-Source0:%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM evolution-tray-gnome3.patch vu...@opensuse.org -- Taken
from git, port to GNOME 3
-Patch0: evolution-tray-gnome3.patch
-# PATCH-FIX-UPSTREAM evolution-tray-gnome3-bis.patch vu...@opensuse.org --
Finish port to GNOME 3, sent upstream by mail
-Patch1: evolution-tray-gnome3-bis.patch
-# PATCH-FIX-UPSTREAM evolution-tray-gnome3-ter.patch dims...@opensnsue.org --
Fix build with evo 3.1.x. Patch based on git commits.
-Patch2: evolution-tray-gnome3-ter.patch
-# Needed by patch0 and patch1
-BuildRequires: gnome-common
+Source0:http://gnome.eu.org/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM evolution-tray-fix-include.patch vu...@opensuse.org --
Add missing include; sent upstream by mail
+Patch0: evolution-tray-fix-include.patch
BuildRequires: intltool
-%if 0%{?favor_gtk2}
-BuildRequires: pkgconfig(evolution-plugin)
-BuildRequires: pkgconfig(evolution-shell)
-BuildRequires: pkgconfig(gtk+-2.0)
-%else
BuildRequires: pkgconfig(evolution-plugin-3.0)
BuildRequires: pkgconfig(evolution-shell-3.0)
BuildRequires: pkgconfig(gtk+-3.0)
-%endif
BuildRequires: pkgconfig(libnotify)
Requires: evolution
Enhances: evolution
@@ -56,16 +44,9 @@
%prep
%setup -q
-%if ! (0%{?favor_gtk2})
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%endif
%build
-%if ! (0%{?favor_gtk2})
-NOCONFIGURE=1 gnome-autogen.sh
-%endif
%configure
%__make %{?_smp_mflags} V=1
++ evolution-tray-fix-include.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
@@ -42,7 +42,8 @@
#include shell/e-shell-window.h
#endif
#if EVOLUTION_VERSION = 29101
-#include mail/e-mail-session.h
+#include e-util/e-account-utils.h
+#include mail/e-mail.h
#else
#include mail/mail-config.h
#include mail/mail-session.h
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit evolution-tray for openSUSE:Factory
Hello community,
here is the log from the commit of package evolution-tray for openSUSE:Factory
checked in at Fri Aug 12 13:23:46 CEST 2011.
--- GNOME/evolution-tray/evolution-tray.changes 2011-06-07 12:19:15.0
+0200
+++ /mounts/work_src_done/STABLE/evolution-tray/evolution-tray.changes
2011-08-10 22:27:55.0 +0200
@@ -1,0 +2,6 @@
+Wed Aug 10 20:27:15 UTC 2011 - dims...@opensuse.org
+
+- Add evolution-tray-gnome3-ter.patch: Fix build against evo 3.1.x.
+ Patch based on git master changes.
+
+---
calling whatdependson for head-i586
New:
evolution-tray-gnome3-ter.patch
Other differences:
--
++ evolution-tray.spec ++
--- /var/tmp/diff_new_pack.VIy4zm/_old 2011-08-12 11:59:46.0 +0200
+++ /var/tmp/diff_new_pack.VIy4zm/_new 2011-08-12 11:59:46.0 +0200
@@ -19,7 +19,7 @@
Name: evolution-tray
Version:0.0.7
-Release:6
+Release:7
License:GPLv2+
Summary:Evolution plugin to minimize in tray
Url:http://gnome.eu.org/evo/index.php/Evolution_Tray
@@ -29,6 +29,8 @@
Patch0: evolution-tray-gnome3.patch
# PATCH-FIX-UPSTREAM evolution-tray-gnome3-bis.patch vu...@opensuse.org --
Finish port to GNOME 3, sent upstream by mail
Patch1: evolution-tray-gnome3-bis.patch
+# PATCH-FIX-UPSTREAM evolution-tray-gnome3-ter.patch dims...@opensnsue.org --
Fix build with evo 3.1.x. Patch based on git commits.
+Patch2: evolution-tray-gnome3-ter.patch
# Needed by patch0 and patch1
BuildRequires: gnome-common
BuildRequires: intltool
@@ -57,6 +59,7 @@
%if ! (0%{?favor_gtk2})
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%endif
%build
++ evolution-tray-gnome3-ter.patch ++
--- evolution-tray-0.0.7/src/tray.c 2011-08-10 22:21:56.207943526 +0200
+++ evolution-tray/src/tray.c 2011-08-10 22:22:43.672113487 +0200
@@ -53,6 +53,10 @@
#include mail/em-event.h
#include mail/em-folder-tree.h
+#if EVOLUTION_VERSION = 30102
+#include mail/e-mail-folder-utils.h
+#include e-util/e-account-utils.h
+#endif
#include e-util/e-icon-factory.h
#include shell/es-event.h
@@ -659,7 +663,7 @@
NULL);
g_signal_connect (
tray_icon, popup-menu,
- G_CALLBACK (popup_menu_status), NULL);
+ G_CALLBACK (popup_menu_status), tray_icon);
}
gtk_status_icon_set_visible (tray_icon, TRUE);
}
@@ -877,9 +881,11 @@
item, activate,
G_CALLBACK (do_quit), NULL);
- g_object_ref_sink (menu);
- gtk_menu_popup (menu, NULL, NULL, NULL, NULL, button, activate_time);
- g_object_unref (menu);
+ gtk_menu_popup (GTK_MENU (menu),
+ NULL, NULL,
+ gtk_status_icon_position_menu,
+ user_data,
+ button, activate_time);
}
static void
@@ -904,6 +910,7 @@
if (!status_count) {
EAccount *account;
+ gchar *folder_name;
#if EVOLUTION_VERSION = 30102
const gchar *uid;
gchar *name = t-display_name;
@@ -926,11 +933,20 @@
#endif
#endif
- if (account != NULL) {
- name = g_strdup_printf (
- %s/%s, e_account_get_string (
- account, E_ACCOUNT_NAME), name);
- }
+#if EVOLUTION_VERSION = 30102
+ if (account != NULL)
+ folder_name = g_strdup_printf (
+ %s/%s, account-name, t-folder_name);
+ else
+ folder_name = g_strdup (t-folder_name);
+#else
+ if (account != NULL)
+ folder_name = g_strdup_printf (
+ %s/%s, e_account_get_strinf (account,
E_ACCOUNT_NAME),
+ name;
+ else
+ folder_name = g_strdup (t-name);
+#endif
status_count = t-new;
@@ -939,10 +955,9 @@
msg = g_strdup_printf (ngettext (
You have received %d new message\nin %s.,
You have received %d new messages\nin %s.,
- status_count), status_count, name);
+ status_count), status_count, folder_name);
- if (name != t-name)
- g_free (name);
+ g_free(folder_name);
#if EVOLUTION_VERSION = 22902
if (t-msg_sender) {
@@ -1076,6 +1091,7 @@
new_notify_status (t);
}
+#if EVOLUTION_VERSION 30101
void get_shell(void *ep, ESEventTargetShell *t)
{
EShell *shell;
@@ -1091,6 +1107,7 @@
G_CALLBACK (shown_first_time_cb), NULL);
}
}
+#endif
commit evolution-tray for openSUSE:Factory
Hello community,
here is the log from the commit of package evolution-tray for openSUSE:Factory
checked in at Tue Jun 7 16:40:54 CEST 2011.
--- GNOME/evolution-tray/evolution-tray.changes 2011-01-07 18:10:54.0
+0100
+++ /mounts/work_src_done/STABLE/evolution-tray/evolution-tray.changes
2011-06-07 12:19:15.0 +0200
@@ -1,0 +2,16 @@
+Tue Jun 7 12:13:46 CEST 2011 - vu...@opensuse.org
+
+- Add evolution-tray-gnome3.patch: taken from git, beginning of a
+ port to GNOME 3.
+- Add evolution-tray-gnome3-bis.patch: finish the port to GNOME 3.
+- Add gnome-common BuildRequires and call to gnome-autogen.sh,
+ required by the patches.
+- Drop unneeded pkgconfig() BuildRequires: libglade-2.0,
+ libgnome-2.0, libgnomeui-2.0.
+- Use %favor_gtk2 to decide if we build against GNOME 3 or not.
+ This controls whether the patches are applied, and switches
+ between those two sets of pkgconfig() BuildRequires:
+ + GNOME 2: evolution-plugin, evolution-shell, gtk+-2.0.
+ + GNOME 3: evolution-plugin-3.0, evolution-shell-3.0, gtk+-3.0.
+
+---
calling whatdependson for head-i586
New:
evolution-tray-gnome3-bis.patch
evolution-tray-gnome3.patch
Other differences:
--
++ evolution-tray.spec ++
--- /var/tmp/diff_new_pack.3PL1aG/_old 2011-06-07 16:40:19.0 +0200
+++ /var/tmp/diff_new_pack.3PL1aG/_new 2011-06-07 16:40:19.0 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package evolution-tray (Version 0.0.7)
+# spec file for package evolution-tray
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,18 +19,28 @@
Name: evolution-tray
Version:0.0.7
-Release:1
+Release:6
License:GPLv2+
Summary:Evolution plugin to minimize in tray
Url:http://gnome.eu.org/evo/index.php/Evolution_Tray
Group: Productivity/Office/Other
Source0:%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM evolution-tray-gnome3.patch vu...@opensuse.org -- Taken
from git, port to GNOME 3
+Patch0: evolution-tray-gnome3.patch
+# PATCH-FIX-UPSTREAM evolution-tray-gnome3-bis.patch vu...@opensuse.org --
Finish port to GNOME 3, sent upstream by mail
+Patch1: evolution-tray-gnome3-bis.patch
+# Needed by patch0 and patch1
+BuildRequires: gnome-common
BuildRequires: intltool
+%if 0%{?favor_gtk2}
BuildRequires: pkgconfig(evolution-plugin)
+BuildRequires: pkgconfig(evolution-shell)
BuildRequires: pkgconfig(gtk+-2.0)
-BuildRequires: pkgconfig(libglade-2.0)
-BuildRequires: pkgconfig(libgnome-2.0)
-BuildRequires: pkgconfig(libgnomeui-2.0)
+%else
+BuildRequires: pkgconfig(evolution-plugin-3.0)
+BuildRequires: pkgconfig(evolution-shell-3.0)
+BuildRequires: pkgconfig(gtk+-3.0)
+%endif
BuildRequires: pkgconfig(libnotify)
Requires: evolution
Enhances: evolution
@@ -44,8 +54,15 @@
%prep
%setup -q
+%if ! (0%{?favor_gtk2})
+%patch0 -p1
+%patch1 -p1
+%endif
%build
+%if ! (0%{?favor_gtk2})
+NOCONFIGURE=1 gnome-autogen.sh
+%endif
%configure
%__make %{?_smp_mflags} V=1
++ evolution-tray-gnome3-bis.patch ++
Index: evolution-tray-0.0.7/configure.ac
===
--- evolution-tray-0.0.7.orig/configure.ac
+++ evolution-tray-0.0.7/configure.ac
@@ -40,7 +40,7 @@ AC_SUBST(LIBGCONFBRIDGE_CFLAGS)
AC_SUBST(LIBGCONFBRIDGE_LIBS)
PKG_CHECK_MODULES(TRAY_EPLUGIN,
- [gtk+-2.0 = $LIBGTK_REQUIRED dnl
+ [gtk+-3.0 = $LIBGTK_REQUIRED dnl
evolution-plugin$EVOLUTION_BASE_VERSION_S = $EVOLUTION_REQUIRED dnl
])
Index: evolution-tray-0.0.7/src/tray.c
===
--- evolution-tray-0.0.7.orig/src/tray.c
+++ evolution-tray-0.0.7/src/tray.c
@@ -887,20 +887,44 @@ new_notify_status (EMEventTargetFolder *
{
gchar *msg;
gboolean new_icon = !tray_icon;
+#if EVOLUTION_VERSION = 30102
+ gchar *uri;
+
+ uri = e_mail_folder_uri_build (t-store, t-folder_name);
+#endif
g_object_set_data_full (
G_OBJECT (tray_icon), uri,
- g_strdup (t-uri), (GDestroyNotify) g_free);
+#if EVOLUTION_VERSION = 30102
+ uri,
+#else
+ g_strdup (t-uri),
+#endif
+ (GDestroyNotify) g_free);
if (!status_count) {
EAccount *account;
+#if EVOLUTION_VERSION = 30102
+ const gchar *uid;
+ gchar *name = t-display_name;
+#else
gchar *name = t-name;
+#endif
+#if EVOLUTION_VERSION = 30102
+ uid = camel_service_get_uid (CAMEL_SERVICE (t-store));
+ account = e_get_account_by_uid (uid);
+#else
+#if EVOLUTION_VERSION == 30101
+ account = t-account;
+#else
#if EVOLUTION_VERSION 29102
account =
