Hello community,
here is the log from the commit of package evolution-tray for openSUSE:Factory
checked in at Mon Jan 10 14:40:24 CET 2011.
--------
--- GNOME/evolution-tray/evolution-tray.changes 2010-11-18 20:53:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/evolution-tray/evolution-tray.changes 2011-01-07 18:10:54.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Jan 7 18:08:08 CET 2011 - vuntz@opensuse.org
+
+- Update to version 0.0.7:
+ + Allow building with old versions of evolution.
+ + Fix tray icon kde issues.
+ + Do not minimize when notification is active.
+ + Support libnotify 0.7.0.
+- Drop evolution-tray-fix-missing-include.patch: fixed upstream.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
evolution-tray-0.0.6.tar.bz2
evolution-tray-fix-missing-include.patch
New:
----
evolution-tray-0.0.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution-tray.spec ++++++
--- /var/tmp/diff_new_pack.8Knsc1/_old 2011-01-10 14:39:10.000000000 +0100
+++ /var/tmp/diff_new_pack.8Knsc1/_new 2011-01-10 14:39:10.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package evolution-tray (Version 0.0.6)
+# spec file for package evolution-tray (Version 0.0.7)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -18,15 +18,13 @@
Name: evolution-tray
-Version: 0.0.6
+Version: 0.0.7
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-fix-missing-include.patch vuntz@opensuse.org -- Fix build by adding missing include, sent upstream by mail
-Patch0: evolution-tray-fix-missing-include.patch
BuildRequires: intltool
BuildRequires: pkgconfig(evolution-plugin)
BuildRequires: pkgconfig(gtk+-2.0)
@@ -46,7 +44,6 @@
%prep
%setup -q
-%patch0 -p1
%build
%configure
++++++ evolution-tray-0.0.6.tar.bz2 -> evolution-tray-0.0.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-tray-0.0.6/ChangeLog new/evolution-tray-0.0.7/ChangeLog
--- old/evolution-tray-0.0.6/ChangeLog 2010-10-25 07:05:35.000000000 +0200
+++ new/evolution-tray-0.0.7/ChangeLog 2011-01-01 23:02:26.000000000 +0100
@@ -1,5 +1,83 @@
# Generated by Makefile. Do not edit.
+commit 3a05ee9cbcc3db84998a826ec1424eead04aa07e
+Author: Lucian Langa
+Date: Sat Jan 1 23:44:55 2011 +0200
+
+ support libnotify 0.7.0
+
+ configure.ac | 3 +++
+ src/Makefile.am | 3 ++-
+ src/tray.c | 6 ++++++
+ 3 files changed, 11 insertions(+), 1 deletions(-)
+
+commit 3e70433925b39d582af38c54d45215f5ccd32e30
+Author: Lucian Langa
+Date: Sat Jan 1 19:47:22 2011 +0200
+
+ remove debug messages
+
+ src/tray.c | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+commit 6857e8029faf42398b7d2ba48a16ae58b9adc0ad
+Author: Lucian Langa
+Date: Fri Dec 31 23:32:21 2010 +0200
+
+ Allow building with older evolution eversion
+ Please note we need at least a gtk 2.14 for a minimal functionality.
+
+ INSTALL | 237 -------------------------------------------------------
+ configure.ac | 26 ++++--
+ src/Makefile.am | 4 +-
+ src/tray.c | 48 +++++++++++-
+ 4 files changed, 67 insertions(+), 248 deletions(-)
+
+commit 1fb703b35eb46cbf146010fea636b03ac0938ff0
+Author: Lucian Langa
+Date: Wed Dec 29 16:32:49 2010 +0200
+
+ allow building with older evolution versions
+
+ src/tray.c | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit 211d08a599864e8960c187f9d8a4f42e2d5675f4
+Author: Lucian Langa
+Date: Wed Dec 29 16:00:46 2010 +0200
+
+ do not minimize when notification is active
+
+ src/tray.c | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit c474a927bd491ab498a2db267ab0375a6a98d951
+Author: Roman Timushev
+Date: Wed Dec 29 10:28:31 2010 +0200
+
+ fix tray icon kde issues
+
+ src/tray.c | 43 +++++++++++++++++++++++++++----------------
+ 1 files changed, 27 insertions(+), 16 deletions(-)
+
+commit 64a02bdab85424fc8a7d56e71edaf5faef3c16e7
+Author: Vincent Untz
+Date: Thu Oct 28 22:26:29 2010 +0300
+
+ fix the build of evo-tray with an old evo
+
+ src/tray.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 27aecbe40813ed4ae9fd4c42cb395e77d2ff2824
+Author: Lucian Langa
+Date: Mon Oct 25 22:31:02 2010 +0300
+
+ allow building with older evolution versions
+
+ src/tray.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
commit 9bc92212cfad22da2e863074ef1e112a9f43ba22
Author: Lucian Langa
Date: Sun Oct 24 21:40:37 2010 +0300
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-tray-0.0.6/config.h.in new/evolution-tray-0.0.7/config.h.in
--- old/evolution-tray-0.0.6/config.h.in 2010-10-24 20:23:23.000000000 +0200
+++ new/evolution-tray-0.0.7/config.h.in 2011-01-01 22:12:41.000000000 +0100
@@ -30,6 +30,9 @@
/* Define if your file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
+/* libgconf-bridge available */
+#undef HAVE_LIBGCONFBRIDGE
+
/* libnotify available */
#undef HAVE_LIBNOTIFY
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-tray-0.0.6/configure new/evolution-tray-0.0.7/configure
--- old/evolution-tray-0.0.6/configure 2010-10-24 20:23:22.000000000 +0200
+++ new/evolution-tray-0.0.7/configure 2011-01-01 22:12:41.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for evolution-tray 0.0.6.
+# Generated by GNU Autoconf 2.66 for evolution-tray 0.0.7.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='evolution-tray'
PACKAGE_TARNAME='evolution-tray'
-PACKAGE_VERSION='0.0.6'
-PACKAGE_STRING='evolution-tray 0.0.6'
+PACKAGE_VERSION='0.0.7'
+PACKAGE_STRING='evolution-tray 0.0.7'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -623,13 +623,17 @@
GCONF_SCHEMA_FILE_DIR
GCONF_SCHEMA_CONFIG_SOURCE
GCONFTOOL
+LIBNOTIFY_VERSION
LIBNOTIFY_LIBS
LIBNOTIFY_CFLAGS
+GTKHTML_EDITOR_LIBS
+GTKHTML_EDITOR_CFLAGS
TRAY_EPLUGIN_LIBS
TRAY_EPLUGIN_CFLAGS
+HAVE_LIBGCONFBRIDGE
+LIBGCONFBRIDGE_LIBS
+LIBGCONFBRIDGE_CFLAGS
EVOLUTION_REQUIRED
-LIBGNOMEUI_REQUIRED
-LIBGNOME_REQUIRED
LIBGTK_REQUIRED
BONBONO_LIBDIR
ERROR_DIR
@@ -818,8 +822,12 @@
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
+LIBGCONFBRIDGE_CFLAGS
+LIBGCONFBRIDGE_LIBS
TRAY_EPLUGIN_CFLAGS
TRAY_EPLUGIN_LIBS
+GTKHTML_EDITOR_CFLAGS
+GTKHTML_EDITOR_LIBS
LIBNOTIFY_CFLAGS
LIBNOTIFY_LIBS'
@@ -1363,7 +1371,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures evolution-tray 0.0.6 to adapt to many kinds of systems.
+\`configure' configures evolution-tray 0.0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1433,7 +1441,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of evolution-tray 0.0.6:";;
+ short | recursive ) echo "Configuration of evolution-tray 0.0.7:";;
esac
cat <<\_ACEOF
@@ -1487,10 +1495,18 @@
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
+ LIBGCONFBRIDGE_CFLAGS
+ C compiler flags for LIBGCONFBRIDGE, overriding pkg-config
+ LIBGCONFBRIDGE_LIBS
+ linker flags for LIBGCONFBRIDGE, overriding pkg-config
TRAY_EPLUGIN_CFLAGS
C compiler flags for TRAY_EPLUGIN, overriding pkg-config
TRAY_EPLUGIN_LIBS
linker flags for TRAY_EPLUGIN, overriding pkg-config
+ GTKHTML_EDITOR_CFLAGS
+ C compiler flags for GTKHTML_EDITOR, overriding pkg-config
+ GTKHTML_EDITOR_LIBS
+ linker flags for GTKHTML_EDITOR, overriding pkg-config
LIBNOTIFY_CFLAGS
C compiler flags for LIBNOTIFY, overriding pkg-config
LIBNOTIFY_LIBS
@@ -1562,7 +1578,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-evolution-tray configure 0.0.6
+evolution-tray configure 0.0.7
generated by GNU Autoconf 2.66
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1927,7 +1943,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by evolution-tray $as_me 0.0.6, which was
+It was created by evolution-tray $as_me 0.0.7, which was
generated by GNU Autoconf 2.66. Invocation command line was
$ $0 $@
@@ -2744,7 +2760,7 @@
# Define the identity of the package.
PACKAGE='evolution-tray'
- VERSION='0.0.6'
+ VERSION='0.0.7'
cat >>confdefs.h <<_ACEOF
@@ -12354,13 +12370,89 @@
LIBGTK_REQUIRED=2.4.0
-LIBGNOME_REQUIRED=2.8.0
-LIBGNOMEUI_REQUIRED=2.8.0
EVOLUTION_REQUIRED=2.4.0
+LIBGCONFBRIDGE_CFLAGS=
+LIBGCONFBRIDGE_LIBS=
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCONFBRIDGE" >&5
+$as_echo_n "checking for LIBGCONFBRIDGE... " >&6; }
+
+if test -n "$LIBGCONFBRIDGE_CFLAGS"; then
+ pkg_cv_LIBGCONFBRIDGE_CFLAGS="$LIBGCONFBRIDGE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgconf-bridge\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgconf-bridge") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGCONFBRIDGE_CFLAGS=`$PKG_CONFIG --cflags "libgconf-bridge" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBGCONFBRIDGE_LIBS"; then
+ pkg_cv_LIBGCONFBRIDGE_LIBS="$LIBGCONFBRIDGE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgconf-bridge\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgconf-bridge") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGCONFBRIDGE_LIBS=`$PKG_CONFIG --libs "libgconf-bridge" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBGCONFBRIDGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgconf-bridge" 2>&1`
+ else
+ LIBGCONFBRIDGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgconf-bridge" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBGCONFBRIDGE_PKG_ERRORS" >&5
+
+ HAVE_LIBGCONFBRIDGE="no"
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_LIBGCONFBRIDGE="no"
+else
+ LIBGCONFBRIDGE_CFLAGS=$pkg_cv_LIBGCONFBRIDGE_CFLAGS
+ LIBGCONFBRIDGE_LIBS=$pkg_cv_LIBGCONFBRIDGE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_LIBGCONFBRIDGE="yes"
+fi
+if test "x$HAVE_LIBGCONFBRIDGE" == "xyes"; then
+
+$as_echo "#define HAVE_LIBGCONFBRIDGE 1" >>confdefs.h
+
+
+fi
+
@@ -12372,12 +12464,12 @@
pkg_cv_TRAY_EPLUGIN_CFLAGS="$TRAY_EPLUGIN_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED gtk+-2.0 >= \$LIBGTK_REQUIRED evolution-plugin\$EVOLUTION_BASE_VERSION_S >= \$EVOLUTION_REQUIRED libglade-2.0 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED libglade-2.0 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$LIBGTK_REQUIRED evolution-plugin\$EVOLUTION_BASE_VERSION_S >= \$EVOLUTION_REQUIRED \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TRAY_EPLUGIN_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED libglade-2.0 " 2>/dev/null`
+ pkg_cv_TRAY_EPLUGIN_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12388,12 +12480,12 @@
pkg_cv_TRAY_EPLUGIN_LIBS="$TRAY_EPLUGIN_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED gtk+-2.0 >= \$LIBGTK_REQUIRED evolution-plugin\$EVOLUTION_BASE_VERSION_S >= \$EVOLUTION_REQUIRED libglade-2.0 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED libglade-2.0 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$LIBGTK_REQUIRED evolution-plugin\$EVOLUTION_BASE_VERSION_S >= \$EVOLUTION_REQUIRED \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TRAY_EPLUGIN_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED libglade-2.0 " 2>/dev/null`
+ pkg_cv_TRAY_EPLUGIN_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12413,14 +12505,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TRAY_EPLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED libglade-2.0 " 2>&1`
+ TRAY_EPLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED " 2>&1`
else
- TRAY_EPLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED libglade-2.0 " 2>&1`
+ TRAY_EPLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$TRAY_EPLUGIN_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED libglade-2.0 ) were not met:
+ as_fn_error $? "Package requirements (gtk+-2.0 >= $LIBGTK_REQUIRED evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED ) were not met:
$TRAY_EPLUGIN_PKG_ERRORS
@@ -12456,6 +12548,149 @@
fi
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKHTML_EDITOR" >&5
+$as_echo_n "checking for GTKHTML_EDITOR... " >&6; }
+
+if test -n "$GTKHTML_EDITOR_CFLAGS"; then
+ pkg_cv_GTKHTML_EDITOR_CFLAGS="$GTKHTML_EDITOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkhtml-editor\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkhtml-editor") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKHTML_EDITOR_CFLAGS=`$PKG_CONFIG --cflags "gtkhtml-editor" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTKHTML_EDITOR_LIBS"; then
+ pkg_cv_GTKHTML_EDITOR_LIBS="$GTKHTML_EDITOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkhtml-editor\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkhtml-editor") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKHTML_EDITOR_LIBS=`$PKG_CONFIG --libs "gtkhtml-editor" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GTKHTML_EDITOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtkhtml-editor" 2>&1`
+ else
+ GTKHTML_EDITOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkhtml-editor" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTKHTML_EDITOR_PKG_ERRORS" >&5
+
+ GTKHTMLEDITOR=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ GTKHTMLEDITOR=no
+else
+ GTKHTML_EDITOR_CFLAGS=$pkg_cv_GTKHTML_EDITOR_CFLAGS
+ GTKHTML_EDITOR_LIBS=$pkg_cv_GTKHTML_EDITOR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ GTKHTMLEDITOR=yes
+fi
+if test "x$GTKHTMLEDITOR" == "xno"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKHTML_EDITOR" >&5
+$as_echo_n "checking for GTKHTML_EDITOR... " >&6; }
+
+if test -n "$GTKHTML_EDITOR_CFLAGS"; then
+ pkg_cv_GTKHTML_EDITOR_CFLAGS="$GTKHTML_EDITOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkhtml-editor\$GTKHTML\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkhtml-editor$GTKHTML") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKHTML_EDITOR_CFLAGS=`$PKG_CONFIG --cflags "gtkhtml-editor$GTKHTML" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTKHTML_EDITOR_LIBS"; then
+ pkg_cv_GTKHTML_EDITOR_LIBS="$GTKHTML_EDITOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkhtml-editor\$GTKHTML\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkhtml-editor$GTKHTML") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKHTML_EDITOR_LIBS=`$PKG_CONFIG --libs "gtkhtml-editor$GTKHTML" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GTKHTML_EDITOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtkhtml-editor$GTKHTML" 2>&1`
+ else
+ GTKHTML_EDITOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkhtml-editor$GTKHTML" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTKHTML_EDITOR_PKG_ERRORS" >&5
+
+ GTKHTMLEDITOR=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ GTKHTMLEDITOR=no
+else
+ GTKHTML_EDITOR_CFLAGS=$pkg_cv_GTKHTML_EDITOR_CFLAGS
+ GTKHTML_EDITOR_LIBS=$pkg_cv_GTKHTML_EDITOR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ GTKHTMLEDITOR=yes
+fi
+fi
+
+
+
+
# Check whether --with-plugin-install-dir was given.
if test "${with_plugin_install_dir+set}" = set; then :
withval=$with_plugin_install_dir;
@@ -12573,6 +12808,9 @@
fi
+LIBNOTIFY_S_VERSION=`$PKG_CONFIG --modversion libnotify`
+LIBNOTIFY_VERSION=`echo $LIBNOTIFY_S_VERSION|$AWK -F . '{print $1 * 1000000 + $2 * 1000 + $3}'`
+
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -13944,7 +14182,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by evolution-tray $as_me 0.0.6, which was
+This file was extended by evolution-tray $as_me 0.0.7, which was
generated by GNU Autoconf 2.66. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14010,7 +14248,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-evolution-tray config.status 0.0.6
+evolution-tray config.status 0.0.7
configured by $0, generated by GNU Autoconf 2.66,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-tray-0.0.6/configure.ac new/evolution-tray-0.0.7/configure.ac
--- old/evolution-tray-0.0.6/configure.ac 2010-10-24 20:40:03.000000000 +0200
+++ new/evolution-tray-0.0.7/configure.ac 2011-01-01 22:01:09.000000000 +0100
@@ -24,23 +24,33 @@
dnl base packages and versions
LIBGTK_REQUIRED=2.4.0
-LIBGNOME_REQUIRED=2.8.0
-LIBGNOMEUI_REQUIRED=2.8.0
EVOLUTION_REQUIRED=2.4.0
AC_SUBST(LIBGTK_REQUIRED)
-AC_SUBST(LIBGNOME_REQUIRED)
-AC_SUBST(LIBGNOMEUI_REQUIRED)
AC_SUBST(EVOLUTION_REQUIRED)
+LIBGCONFBRIDGE_CFLAGS=
+LIBGCONFBRIDGE_LIBS=
+PKG_CHECK_MODULES([LIBGCONFBRIDGE], libgconf-bridge, [HAVE_LIBGCONFBRIDGE="yes"], [HAVE_LIBGCONFBRIDGE="no"])
+if test "x$HAVE_LIBGCONFBRIDGE" == "xyes"; then
+ AC_DEFINE(HAVE_LIBGCONFBRIDGE, 1, [libgconf-bridge available])
+ AC_SUBST(HAVE_LIBGCONFBRIDGE)
+fi
+AC_SUBST(LIBGCONFBRIDGE_CFLAGS)
+AC_SUBST(LIBGCONFBRIDGE_LIBS)
+
PKG_CHECK_MODULES(TRAY_EPLUGIN,
- [libgnome-2.0 >= $LIBGNOME_REQUIRED dnl
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dnl
- gtk+-2.0 >= $LIBGTK_REQUIRED dnl
+ [gtk+-2.0 >= $LIBGTK_REQUIRED dnl
evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
- libglade-2.0 dnl
])
+PKG_CHECK_MODULES([GTKHTML_EDITOR], gtkhtml-editor, [GTKHTMLEDITOR=yes], [GTKHTMLEDITOR=no])
+if test "x$GTKHTMLEDITOR" == "xno"; then
+PKG_CHECK_MODULES([GTKHTML_EDITOR], gtkhtml-editor$GTKHTML, [GTKHTMLEDITOR=yes], [GTKHTMLEDITOR=no])
+fi
+AC_SUBST(GTKHTML_EDITOR_CFLAGS)
+AC_SUBST(GTKHTML_EDITOR_LIBS)
+
dnl Evolution plugin install directory
AC_ARG_WITH(plugin-install-dir, [ --with-plugin-install-dir=PATH path to evolution plugin directory])
if test "x$with_plugin_install_dir" = "x" ; then
@@ -85,6 +95,9 @@
fi
AC_SUBST(LIBNOTIFY_CFLAGS)
AC_SUBST(LIBNOTIFY_LIBS)
+LIBNOTIFY_S_VERSION=`$PKG_CONFIG --modversion libnotify`
+LIBNOTIFY_VERSION=`echo $LIBNOTIFY_S_VERSION|$AWK -F . '{print $1 * 1000000 + $2 * 1000 + $3}'`
+AC_SUBST(LIBNOTIFY_VERSION)
dnl ***********
dnl GConf stuff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-tray-0.0.6/INSTALL new/evolution-tray-0.0.7/INSTALL
--- old/evolution-tray-0.0.6/INSTALL 2009-10-07 20:03:56.000000000 +0200
+++ new/evolution-tray-0.0.7/INSTALL 2011-01-01 22:12:42.000000000 +0100
@@ -2,18 +2,24 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
-Briefly, the shell commands `./configure; make; make install' should
+ Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -42,7 +48,7 @@
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
- 5. You can remove the program binaries and object files from the
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -67,15 +83,22 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -88,25 +111,41 @@
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -117,16 +156,47 @@
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -138,14 +208,53 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -153,7 +262,8 @@
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
@@ -171,9 +281,9 @@
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +292,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -201,11 +311,19 @@
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -232,6 +350,16 @@
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-tray-0.0.6/Makefile.in new/evolution-tray-0.0.7/Makefile.in
--- old/evolution-tray-0.0.6/Makefile.in 2010-10-24 20:23:24.000000000 +0200
+++ new/evolution-tray-0.0.7/Makefile.in 2011-01-01 22:12:43.000000000 +0100
@@ -154,6 +154,9 @@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+GTKHTML_EDITOR_CFLAGS = @GTKHTML_EDITOR_CFLAGS@
+GTKHTML_EDITOR_LIBS = @GTKHTML_EDITOR_LIBS@
+HAVE_LIBGCONFBRIDGE = @HAVE_LIBGCONFBRIDGE@
ICON_DIR = @ICON_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -168,11 +171,12 @@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBGNOMEUI_REQUIRED = @LIBGNOMEUI_REQUIRED@
-LIBGNOME_REQUIRED = @LIBGNOME_REQUIRED@
+LIBGCONFBRIDGE_CFLAGS = @LIBGCONFBRIDGE_CFLAGS@
+LIBGCONFBRIDGE_LIBS = @LIBGCONFBRIDGE_LIBS@
LIBGTK_REQUIRED = @LIBGTK_REQUIRED@
LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
+LIBNOTIFY_VERSION = @LIBNOTIFY_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-tray-0.0.6/src/Makefile.am new/evolution-tray-0.0.7/src/Makefile.am
--- old/evolution-tray-0.0.6/src/Makefile.am 2010-10-24 20:02:35.000000000 +0200
+++ new/evolution-tray-0.0.7/src/Makefile.am 2011-01-01 22:01:09.000000000 +0100
@@ -7,7 +7,9 @@
-DEVOLUTION_VERSION=$(evolution_version_int) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\" \
- $(TRAY_EPLUGIN_CFLAGS)
+ -DLIBNOTIFY_VERSION=$(LIBNOTIFY_VERSION) \
+ $(TRAY_EPLUGIN_CFLAGS) \
+ $(GTKHTML_EDITOR_CFLAGS)
%.eplug.in: %.eplug.xml
@@ -28,6 +30,7 @@
plugin_LTLIBRARIES = liborg-gnome-evolution-tray.la
liborg_gnome_evolution_tray_la_SOURCES = tray.c
+liborg_gnome_evolution_tray_la_LIBADD = $(LIBGCONFBRIDGE_LIBS) $(LIBNOTIFY_LIBS)
liborg_gnome_evolution_tray_la_LDFLAGS = -module -avoid-version -rpath $(PLUGIN_INSTALL_DIR)
EXTRA_DIST = org-gnome-evolution-tray.eplug.xml \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-tray-0.0.6/src/Makefile.in new/evolution-tray-0.0.7/src/Makefile.in
--- old/evolution-tray-0.0.6/src/Makefile.in 2010-10-24 20:23:24.000000000 +0200
+++ new/evolution-tray-0.0.7/src/Makefile.in 2011-01-01 22:12:42.000000000 +0100
@@ -72,7 +72,9 @@
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"
LTLIBRARIES = $(plugin_LTLIBRARIES)
-liborg_gnome_evolution_tray_la_LIBADD =
+am__DEPENDENCIES_1 =
+liborg_gnome_evolution_tray_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_liborg_gnome_evolution_tray_la_OBJECTS = tray.lo
liborg_gnome_evolution_tray_la_OBJECTS = \
$(am_liborg_gnome_evolution_tray_la_OBJECTS)
@@ -157,6 +159,9 @@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+GTKHTML_EDITOR_CFLAGS = @GTKHTML_EDITOR_CFLAGS@
+GTKHTML_EDITOR_LIBS = @GTKHTML_EDITOR_LIBS@
+HAVE_LIBGCONFBRIDGE = @HAVE_LIBGCONFBRIDGE@
ICON_DIR = @ICON_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -171,11 +176,12 @@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBGNOMEUI_REQUIRED = @LIBGNOMEUI_REQUIRED@
-LIBGNOME_REQUIRED = @LIBGNOME_REQUIRED@
+LIBGCONFBRIDGE_CFLAGS = @LIBGCONFBRIDGE_CFLAGS@
+LIBGCONFBRIDGE_LIBS = @LIBGCONFBRIDGE_LIBS@
LIBGTK_REQUIRED = @LIBGTK_REQUIRED@
LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
+LIBNOTIFY_VERSION = @LIBNOTIFY_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -285,7 +291,9 @@
-DEVOLUTION_VERSION=$(evolution_version_int) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\" \
- $(TRAY_EPLUGIN_CFLAGS)
+ -DLIBNOTIFY_VERSION=$(LIBNOTIFY_VERSION) \
+ $(TRAY_EPLUGIN_CFLAGS) \
+ $(GTKHTML_EDITOR_CFLAGS)
plugindir = $(PLUGIN_INSTALL_DIR)
plugin_DATA = \
@@ -293,6 +301,7 @@
plugin_LTLIBRARIES = liborg-gnome-evolution-tray.la
liborg_gnome_evolution_tray_la_SOURCES = tray.c
+liborg_gnome_evolution_tray_la_LIBADD = $(LIBGCONFBRIDGE_LIBS) $(LIBNOTIFY_LIBS)
liborg_gnome_evolution_tray_la_LDFLAGS = -module -avoid-version -rpath $(PLUGIN_INSTALL_DIR)
EXTRA_DIST = org-gnome-evolution-tray.eplug.xml \
$(schema_in_files)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-tray-0.0.6/src/tray.c new/evolution-tray-0.0.7/src/tray.c
--- old/evolution-tray-0.0.6/src/tray.c 2010-10-24 20:34:58.000000000 +0200
+++ new/evolution-tray-0.0.7/src/tray.c 2011-01-01 22:01:09.000000000 +0100
@@ -16,13 +16,21 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include
#include
#include
#include
#include
+#ifdef HAVE_LIBGCONFBRIDGE
+#include
+#else
#include
+#endif
#include
@@ -36,11 +44,11 @@
#if EVOLUTION_VERSION >= 29101
#include
#else
+#include
#include
#endif
#include
#include
-#include
#include
#include
@@ -64,6 +72,9 @@
static guint status_count = 0;
static gboolean winstatus;
+static gboolean winnotify = FALSE;
+
+static gulong shown_first_time_handle = 0;
#ifdef HAVE_LIBNOTIFY
static NotifyNotification *notify = NULL;
@@ -275,10 +286,20 @@
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
gtk_widget_show (widget);
+#if EVOLUTION_VERSION >= 29101
g_object_bind_property (
master, "active",
widget, "sensitive",
G_BINDING_SYNC_CREATE);
+#else
+#if EVOLUTION_VERSION >= 22502
+ e_binding_new (
+ master, "active",
+ widget, "sensitive");
+#else
+ g_warning("add missing properties binding for 2.24\n");
+#endif
+#endif
container = widget;
@@ -343,10 +364,20 @@
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
gtk_widget_show (widget);
+#if EVOLUTION_VERSION >= 29101
g_object_bind_property (
master, "active",
widget, "sensitive",
G_BINDING_SYNC_CREATE);
+#else
+#if EVOLUTION_VERSION >= 22502
+ e_binding_new (
+ master, "active",
+ widget, "sensitive");
+#else
+ g_warning("add missing properties binding for 2.24\n");
+#endif
+#endif
container = widget;
@@ -530,35 +561,30 @@
//helper method for toggling used on init for hidden on startup and on tray click
static void
-toggle_window (int just_minimize)
+toggle_window (void)
{
GList *p, *pnext;
#if EVOLUTION_VERSION < 22900
for (p = (gpointer)evo_window; p != NULL; p = pnext) {
pnext = p->next;
- if (just_minimize || gtk_window_is_active(GTK_WINDOW(p->data))) {
- gtk_window_iconify(GTK_WINDOW(p->data));
- gtk_window_set_skip_taskbar_hint(GTK_WINDOW(p->data), TRUE);
+ if (gtk_window_is_active(GTK_WINDOW(p->data))) {
+ gtk_widget_hide(GTK_WIDGET(p->data));
winstatus = TRUE;
} else {
- gtk_window_iconify(GTK_WINDOW(p->data));
+ gtk_widget_show(GTK_WIDGET(p->data));
gtkut_window_popup(GTK_WIDGET(p->data));
- gtk_window_set_skip_taskbar_hint(GTK_WINDOW(p->data), FALSE);
winstatus = FALSE;
}
}
#else
- if (just_minimize || gtk_window_is_active(GTK_WINDOW(evo_window))) {
- gtk_window_iconify(GTK_WINDOW(evo_window));
- gtk_window_set_skip_taskbar_hint(GTK_WINDOW(evo_window), TRUE);
+ if (gtk_window_is_active(GTK_WINDOW(evo_window))) {
+ gtk_widget_hide(GTK_WIDGET(evo_window));
winstatus = TRUE;
} else {
- gtk_window_iconify(GTK_WINDOW(evo_window));
+ gtk_widget_show(GTK_WIDGET(evo_window));
gtkut_window_popup(GTK_WIDGET(evo_window));
- gtk_window_set_skip_taskbar_hint(GTK_WINDOW(evo_window), FALSE);
winstatus = FALSE;
-
}
#endif
}
@@ -572,7 +598,10 @@
e_icon_factory_get_icon (
"mail-read",
GTK_ICON_SIZE_SMALL_TOOLBAR));
+#if GTK_VERSION >= 2016000
gtk_status_icon_set_has_tooltip (tray_icon, FALSE);
+#endif
+ winnotify = FALSE;
}
static gboolean
@@ -581,10 +610,12 @@
GdkEventButton *event,
gpointer data)
{
- if (event->button != 1 || event->type != GDK_2BUTTON_PRESS && winstatus != TRUE) {
+ if (event->button != 1 || event->type != GDK_2BUTTON_PRESS
+ && winstatus != TRUE && winnotify == TRUE) {
+ gtk_window_present(GTK_WINDOW(evo_window));
return FALSE;
}
- toggle_window(FALSE);
+ toggle_window();
icon_activated(NULL, NULL);
return TRUE;
}
@@ -609,7 +640,6 @@
"button-press-event",
G_CALLBACK (button_press_cb),
NULL);
-
g_signal_connect (
tray_icon, "popup-menu",
G_CALLBACK (popup_menu_status), NULL);
@@ -628,9 +658,17 @@
static void
do_quit (GtkMenuItem *item, gpointer user_data)
{
+#if EVOLUTION_VERSION < 22900
+ bonobo_main_quit();
+#else
EShell *shell;
shell = e_shell_get_default ();
+#if EVOLUTION_VERSION >= 23103
e_shell_quit (shell, E_SHELL_QUIT_ACTION);
+#else
+ e_shell_quit (shell);
+#endif
+#endif
}
static void
@@ -677,7 +715,13 @@
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
+#if GTK_VERSION >= 2014000
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+#else
+ content_area = GTK_DIALOG (dialog)->vbox;
+#endif
+
+
#if !GTK_CHECK_VERSION(2,90,7)
g_object_set (dialog, "has-separator", FALSE, NULL);
@@ -705,8 +749,16 @@
}
static void
+shown_first_time_cb (GtkWidget *widget, gpointer user_data)
+{
+ g_signal_handler_disconnect(widget, shown_first_time_handle);
+ gtk_widget_hide(widget);
+}
+
+static void
status_icon_activate_cb (void)
{
+#if EVOLUTION_VERSION >= 22900
EShell *shell;
EShellView *shell_view;
EShellWindow *shell_window;
@@ -738,6 +790,7 @@
shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
g_object_get (shell_sidebar, "folder-tree", &folder_tree, NULL);
em_folder_tree_set_selected (folder_tree, uri, FALSE);
+#endif
remove_notification ();
}
@@ -850,6 +903,7 @@
if (name != t->name)
g_free (name);
+#if EVOLUTION_VERSION >= 22902
if (t->msg_sender) {
gchar *tmp, *str;
@@ -874,6 +928,7 @@
g_free (str);
msg = tmp;
}
+#endif
} else {
status_count += t->new;
msg = g_strdup_printf (ngettext (
@@ -882,7 +937,9 @@
status_count), status_count);
}
+#if GTK_VERSION >= 2016000
gtk_status_icon_set_tooltip_text (tray_icon, msg);
+#endif
gtk_status_icon_set_from_pixbuf (
tray_icon,
e_icon_factory_get_icon (
@@ -905,9 +962,15 @@
notify = notify_notification_new (
_("New email"), safetext,
+#if LIBNOTIFY_VERSION < 7000
"mail-unread", NULL);
+#else
+ "mail-unread");
+#endif
+#if LIBNOTIFY_VERSION < 7000
notify_notification_attach_to_status_icon (
notify, tray_icon);
+#endif
/* Check if actions are supported */
if (can_support_actions ()) {
@@ -922,6 +985,7 @@
g_free (safetext);
}
#endif
+ winnotify = TRUE;
g_free (msg);
}
@@ -955,10 +1019,18 @@
create_status_icon();
}
+#if EVOLUTION_VERSION < 22900
+void org_gnome_evolution_tray_mail_new_notify (void *ep, EMEventTargetFolder *t);
+#else
void org_gnome_evolution_tray_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t);
+#endif
void
+#if EVOLUTION_VERSION < 22900
+org_gnome_evolution_tray_mail_new_notify (void *ep, EMEventTargetFolder *t)
+#else
org_gnome_evolution_tray_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
+#endif
{
new_notify_status (t);
}
@@ -972,7 +1044,10 @@
evo_window = (GtkWidget *)priv->windows;
#endif
if (is_part_enabled(GCONF_KEY_HIDDEN_ON_STARTUP)) {
- toggle_window(TRUE);
+ shown_first_time_handle =
+ g_signal_connect (G_OBJECT (evo_window),
+ "show",
+ G_CALLBACK (shown_first_time_cb), NULL);
}
}
@@ -984,7 +1059,10 @@
{
evo_window = e_shell_view_get_shell_window (shell_view);
if (is_part_enabled(GCONF_KEY_HIDDEN_ON_STARTUP)) {
- toggle_window(TRUE);
+ shown_first_time_handle =
+ g_signal_connect (G_OBJECT (evo_window),
+ "show",
+ G_CALLBACK (shown_first_time_cb), NULL);
}
return TRUE;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org