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.000000000 +0100 +++ /mounts/work_src_done/STABLE/evolution-tray/evolution-tray.changes 2011-06-07 12:19:15.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jun 7 12:13:46 CEST 2011 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.3PL1aG/_new 2011-06-07 16:40:19.000000000 +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 [email protected] -- Taken from git, port to GNOME 3 +Patch0: evolution-tray-gnome3.patch +# PATCH-FIX-UPSTREAM evolution-tray-gnome3-bis.patch [email protected] -- 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 = mail_config_get_account_by_source_url (t->uri); #else account = e_get_account_by_source_url (t->uri); #endif +#endif +#endif if (account != NULL) { name = g_strdup_printf ( ++++++ evolution-tray-gnome3.patch ++++++ >From 7043219a620b62be18981eedbbfa6cf7512c2e61 Mon Sep 17 00:00:00 2001 From: Lucian Langa <[email protected]> Date: Sun, 27 Mar 2011 12:01:39 +0000 Subject: allow build with newer gtk versions --- diff --git a/m4/evolution.m4 b/m4/evolution.m4 index 89403b4..2aba701 100644 --- a/m4/evolution.m4 +++ b/m4/evolution.m4 @@ -24,11 +24,16 @@ AC_PROG_AWK AC_MSG_CHECKING(Evolution version) dnl is this a reasonable thing to do ? -EVOLUTION_VERSION=`$PKG_CONFIG --modversion evolution-shell 2>/dev/null` +EVOLUTION_VERSION=`$PKG_CONFIG --modversion evolution-shell-3.0 2>/dev/null` +if test -n "$EVOLUTION_VERSION"; then + EVOLUTION_BASE_VERSION_S="-3.0" +else + EVOLUTION_VERSION=`$PKG_CONFIG --modversion evolution-shell 2>/dev/null` + EVOLUTION_BASE_VERSION_S="" +fi if test -n "$EVOLUTION_VERSION"; then EVOLUTION_BASE_VERSION=$EVOLUTION_VERSION - EVOLUTION_BASE_VERSION_S="" - EVOLUTION_EXEC_VERSION=`$PKG_CONFIG --variable=execversion evolution-shell 2>/dev/null` + EVOLUTION_EXEC_VERSION=`$PKG_CONFIG --variable=execversion evolution-shell$EVOLUTION_BASE_VERSION_S 2>/dev/null` if test -n "$EVOLUTION_EXEC_VERSION"; then break; else @@ -65,10 +70,6 @@ AC_MSG_RESULT($EVOLUTION_VERSION) AC_SUBST(EVOLUTION_EXEC_VERSION) evolution_version_int="$(echo "$EVOLUTION_VERSION" | $AWK -F . '{print [$]1 * 10000 + [$]2 * 100 + [$]3}')" -if test "$evolution_version_int" -ge "21100"; then - AC_DEFINE_UNQUOTED(EVOLUTION_2_12,1, [evolution mail 2.12 present]) - AC_SUBST(EVOLUTION_2_12) -fi AC_SUBST(evolution_version_int) MINOR_VERSION="$(echo $EVOLUTION_VERSION|cut -d. -f2|$AWK -F . '{print 1000 * [$]1}')" diff --git a/src/tray.c b/src/tray.c index 694ede3..1702208 100644 --- a/src/tray.c +++ b/src/tray.c @@ -538,16 +538,29 @@ void gtkut_window_popup(GtkWidget *window) gint x, y, sx, sy, new_x, new_y; g_return_if_fail(window != NULL); +#if GTK_CHECK_VERSION (2,14,0) + g_return_if_fail(gtk_widget_get_window(window) != NULL); +#else g_return_if_fail(window->window != NULL); +#endif sx = gdk_screen_width(); sy = gdk_screen_height(); +#if GTK_CHECK_VERSION (2,14,0) + gdk_window_get_origin(gtk_widget_get_window(window), &x, &y); +#else gdk_window_get_origin(window->window, &x, &y); +#endif new_x = x % sx; if (new_x < 0) new_x = 0; new_y = y % sy; if (new_y < 0) new_y = 0; - if (new_x != x || new_y != y) + if (new_x != x || new_y != y) { +#if GTK_CHECK_VERSION (2,14,0) + gdk_window_move(gtk_widget_get_window(window), new_x, new_y); +#else gdk_window_move(window->window, new_x, new_y); +#endif + } gtk_window_set_skip_taskbar_hint( GTK_WINDOW(window), @@ -555,8 +568,12 @@ void gtkut_window_popup(GtkWidget *window) gtk_window_present(GTK_WINDOW(window)); #ifdef G_OS_WIN32 /* ensure that the window is displayed at the top */ +#if GTK_CHECK_VERSION (2,14,0) + gdk_window_show(gtk_widget_get_window(window)); +#else gdk_window_show(window->window); #endif +#endif } //helper method for toggling used on init for hidden on startup and on tray click @@ -715,10 +732,10 @@ do_properties (GtkMenuItem *item, gpointer user_data) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); -#if GTK_VERSION >= 2014000 - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); +#if GTK_CHECK_VERSION (2,14,0) + content_area = gtk_dialog_get_content_area(GTK_DIALOG (dialog)); #else - content_area = GTK_DIALOG (dialog)->vbox; + content_area = GTK_DIALOG (dialog)->vbox; #endif -- cgit v0.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
