commit xfce4-panel-plugin-mailwatch for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-panel-plugin-mailwatch for openSUSE:Factory checked in at Thu Mar 17 11:40:23 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/xfce4-panel-plugin-mailwatch/xfce4-panel-plugin-mailwatch.changes 2011-03-09 22:44:10.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed Mar 9 11:00:00 UTC 2011 - gber@opensuse.org + +- new package (split off from xfce4-panel-plugins) + calling whatdependson for head-i586 New: ---- xfce4-mailwatch-plugin-1.1.0.tar.bz2 xfce4-panel-plugin-mailwatch-1.1.0-fix-build-with-4.7.patch xfce4-panel-plugin-mailwatch-1.1.0-fix-high-cpu-usage-while-checking-mail.patch xfce4-panel-plugin-mailwatch.changes xfce4-panel-plugin-mailwatch.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugin-mailwatch.spec ++++++ # # spec file for package xfce4-panel-plugin-mailwatch # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define panel_version 4.8.0 %define plugin_name xfce4-mailwatch-plugin Name: xfce4-panel-plugin-mailwatch License: GPLv2+ Version: 1.1.0 Release: 7 Summary: Versatile mail checking plugin for the Xfce panel Url: http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin Source0: xfce4-mailwatch-plugin-1.1.0.tar.bz2 # PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-fix-high-cpu-usage-while-checking-mail.patch bxo#4494 gber@opensuse.org -- Fixes high CPU usage when checking mail (backported from upstream git) Patch0: xfce4-panel-plugin-mailwatch-1.1.0-fix-high-cpu-usage-while-checking-mail.patch # PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-fix-build-with-4.7.patch gber@opensuse.org -- Fixes build with xfce4-panel >= 4.7 Patch1: xfce4-panel-plugin-mailwatch-1.1.0-fix-build-with-4.7.patch Group: System/GUI/XFCE BuildRequires: intltool BuildRequires: fdupes BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(gnutls) BuildRequires: xfce4-dev-tools Requires: xfce4-panel >= 4.8.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Mailwatch plugin is a multi-protocol, multi-mailbox mail checking tool which supports a variety of protocols and local mailbox formats. It can check multiple locations and execute cutoms actions when it find new mail. %prep %setup -q -n %{plugin_name}-%{version} %patch0 -p1 %patch1 -p1 %build xdt-autogen %configure --disable-static make %{_smp_mflags} V=1 %install %make_install rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{plugin_name} %{name}.lang %fdupes %{buildroot}%{_datadir} %clean rm -rf %{buildroot} %if 0%{?suse_version} >= 1140 %post %icon_theme_cache_post %postun %icon_theme_cache_postun %endif %files -f %{name}.lang %defattr(-,root,root) %{_libexecdir}/xfce4/panel-plugins/xfce4-mailwatch-plugin %{_datadir}/icons/hicolor/*/apps/xfce-n*mail.* %{_datadir}/xfce4/panel-plugins/mailwatch.desktop %doc %dir %{_datadir}/xfce4/doc %doc %dir %{_datadir}/xfce4/doc/* %doc %dir %{_datadir}/xfce4/doc/*/images %doc %{_datadir}/xfce4/doc/*/*mailwatch*.html %doc %{_datadir}/xfce4/doc/*/images/*mailwatch* %changelog ++++++ xfce4-panel-plugin-mailwatch-1.1.0-fix-build-with-4.7.patch ++++++ diff -ur xfce4-mailwatch-plugin-1.1.0.orig/panel-plugin/Makefile.am xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am --- xfce4-mailwatch-plugin-1.1.0.orig/panel-plugin/Makefile.am 2008-09-15 07:14:45.000000000 +0200 +++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am 2010-12-05 11:19:43.000000000 +0100 @@ -50,6 +50,7 @@ -I$(top_srcdir)/libmailwatch-core \ @GTHREAD_CFLAGS@ \ @LIBXFCE4PANEL_CFLAGS@ \ + @LIBXFCEGUI4_CFLAGS@ \ -DDATADIR=\"$(datadir)\" \ -DLOCALEDIR=\"$(localedir)\" @@ -60,6 +61,7 @@ $(top_builddir)/libmailwatch-core/libmailwatch-core.la \ @GTHREAD_LIBS@ \ @LIBXFCE4PANEL_LIBS@ \ + @LIBXFCEGUI4_LIBS@ \ @GNUTLS_LIBS@ if HAVE_CYGWIN ++++++ xfce4-panel-plugin-mailwatch-1.1.0-fix-high-cpu-usage-while-checking-mail.patch ++++++ diff -ur xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-net-conn.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c --- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-net-conn.c 2008-09-15 07:14:45.000000000 +0200 +++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c 2010-12-05 11:13:09.000000000 +0100 @@ -765,10 +765,16 @@ return -1; } else if(!block) return 0; - } while(ret < 0 && EINTR == errno && !TIMER_EXPIRED(RECV_TIMEOUT) - && SHOULD_CONTINUE(net_conn)); + } while((ret == 0 || (ret < 0 && EINTR == errno)) + && !TIMER_EXPIRED(RECV_TIMEOUT) && SHOULD_CONTINUE(net_conn)); - if(!SHOULD_CONTINUE(net_conn)) { + if(ret < 0 && EINTR != errno) { + if(error) { + g_set_error(error, XFCE_MAILWATCH_ERROR, + XFCE_MAILWATCH_ERROR_FAILED, strerror(errno)); + } + return -1; + } else if(!SHOULD_CONTINUE(net_conn)) { if(error) { g_set_error(error, XFCE_MAILWATCH_ERROR, XFCE_MAILWATCH_ERROR_ABORTED, _("Operation aborted")); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de