Hello community, here is the log from the commit of package pidgin-indicator for openSUSE:Factory checked in at 2018-08-12 20:56:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pidgin-indicator (Old) and /work/SRC/openSUSE:Factory/.pidgin-indicator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pidgin-indicator" Sun Aug 12 20:56:37 2018 rev:4 rq:628781 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pidgin-indicator/pidgin-indicator.changes 2017-02-03 18:55:49.154836578 +0100 +++ /work/SRC/openSUSE:Factory/.pidgin-indicator.new/pidgin-indicator.changes 2018-08-12 20:56:39.041623043 +0200 @@ -1,0 +2,9 @@ +Thu Aug 9 12:01:37 UTC 2018 - [email protected] + +- Update to version 1.0.1: + * Reduce logging spam. +- Add pidgin-indicator-ayatana-appindicator.patch: Support and + prefer Ayatana AppIndicators. +- Build with Ayatana AppIndicators on openSUSE Leap 15.0 or newer. + +------------------------------------------------------------------- Old: ---- pidgin-indicator-1.0.tar.gz New: ---- pidgin-indicator-1.0.1.tar.gz pidgin-indicator-ayatana-appindicator.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pidgin-indicator.spec ++++++ --- /var/tmp/diff_new_pack.jMLTRk/_old 2018-08-12 20:56:39.425623824 +0200 +++ /var/tmp/diff_new_pack.jMLTRk/_new 2018-08-12 20:56:39.425623824 +0200 @@ -1,7 +1,7 @@ # # spec file for package pidgin-indicator # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX 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,21 +18,27 @@ %define _name indicator Name: pidgin-indicator -Version: 1.0 +Version: 1.0.1 Release: 0 Summary: StatusNotifierItem tray icon plugin for Pidgin -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Instant Messenger -Url: https://github.com/philipl/pidgin-indicator +URL: https://github.com/philipl/pidgin-indicator Source: https://github.com/philipl/pidgin-indicator/releases/download/%{version}/%{name}-%{version}.tar.gz +# PATCH-FEATURE-OPENSUSE pidgin-indicator-ayatana-appindicator.patch -- Support and prefer Ayatana AppIndicators. +Patch0: pidgin-indicator-ayatana-appindicator.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: pkgconfig(appindicator-0.1) BuildRequires: pkgconfig(pidgin) +%if 0%{?suse_version} >= 1500 +BuildRequires: pkgconfig(ayatana-appindicator-0.1) +%else +BuildRequires: pkgconfig(appindicator-0.1) +%endif %description This plugin provides a StatusNotifierItem tray icon, for use in @@ -56,36 +62,37 @@ %package -n pidgin-plugin-%{_name} Summary: StatusNotifierItem tray icon plugin for Pidgin Group: Productivity/Networking/Instant Messenger +%requires_ge pidgin Recommends: pidgin-plugin-%{_name}-lang # pidgin-indicator was last used in openSUSE Leap 42.2. Provides: %{name} = %{version}-%{release} Obsoletes: %{name} < %{version}-%{release} Obsoletes: %{name}-lang < %{version}-%{release} -%requires_ge pidgin %description -n pidgin-plugin-%{_name} This plugin provides a StatusNotifierItem tray icon, for use in -KDE Plasma 5, Unity, Elementary and other environments. +MATE, KDE Plasma 5, Elementary Pantheon and other environments. It provides all the same functionality as the original tray icon but not in exactly the same way: - * The 'smart' click behaviour that either shows the buddy list or + * The "smart" click behaviour that either shows the buddy list or unread messages is now activated by a middle-click – because left click on an libappindicator always opens the menu. * As the SNI-icon is a separate process from pidgin itself, there are sometimes conflicts with Focus Stealing Prevention when you use the indicator to go to unread messages. You may need to disable FSP for Pidgin to get around this. - * Due to how libappindicator work, the middle-click action must - also be a menu item, so it's the new Show/Hide item at the top - of the menu. - * Due to libappindicator limitations, some of the special icons - can't be shown next to menu items any more. + * Due to how libayatana-appindicator work, the middle-click action + must also be a menu item, so it's the new Show/Hide item at the + top of the menu. + * Due to libayatana-appindicator limitations, some of the special + icons can't be shown next to menu items any more. %lang_package -n pidgin-plugin-indicator %prep %setup -q +%patch0 -p1 %build autoreconf -fi @@ -98,12 +105,11 @@ %find_lang %{name} %files -n pidgin-plugin-%{_name} -%defattr(-,root,root) -%doc COPYING AUTHORS +%license COPYING +%doc AUTHORS %{_libdir}/pidgin/%{_name}.so %{_datadir}/icons/hicolor/*/status/%{name}-nothing.png %files -n pidgin-plugin-%{_name}-lang -f %{name}.lang -%defattr(-,root,root) %changelog ++++++ pidgin-indicator-1.0.tar.gz -> pidgin-indicator-1.0.1.tar.gz ++++++ ++++ 3420 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pidgin-indicator-1.0/Makefile.am new/pidgin-indicator-1.0.1/Makefile.am --- old/pidgin-indicator-1.0/Makefile.am 2015-02-07 05:13:24.000000000 +0100 +++ new/pidgin-indicator-1.0.1/Makefile.am 2018-05-02 20:12:04.000000000 +0200 @@ -3,7 +3,7 @@ COPYING \ INSTALL \ NEWS \ - README + README.md SUBDIRS = icons src po diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pidgin-indicator-1.0/NEWS new/pidgin-indicator-1.0.1/NEWS --- old/pidgin-indicator-1.0/NEWS 2016-05-18 18:19:52.000000000 +0200 +++ new/pidgin-indicator-1.0.1/NEWS 2018-05-02 20:12:04.000000000 +0200 @@ -1,6 +1,12 @@ pidgin-indicator: Ubuntu Indicator Plugin for Pidgin ==================================================== +1.0.1 (2018-05-02): + +* Reduce logging spam. +* Update README. +* Bring debian build files into the tree. + 1.0 (2016-05-18): * Add Russian translation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pidgin-indicator-1.0/README new/pidgin-indicator-1.0.1/README --- old/pidgin-indicator-1.0/README 2016-05-18 18:07:14.000000000 +0200 +++ new/pidgin-indicator-1.0.1/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -pidgin-indicator: Ubuntu Indicator Plugin for Pidgin -==================================================== - -This plugin provides an Ubuntu Indicator icon, for use in the Unity desktop -environment. Unity no longer provides a general purpose notification tray, -so the standard Pidgin tray icon does not appear. The official Ubuntu -alternative is an integration with their Messaging indicator, which -consolidates status from multiple applications. I've found this indicator to -be much less usable than the original Pidgin tray icon, so I decided to -build this plugin to restore the icon's functionality in a maintainable -way (in contrast to having to run a patched version of Unity). - -Functionality -------------- - -The indicator provides all the same functionality as the original tray icon, -but not in exactly the same way. - -* The 'smart' click behaviour that either shows the buddy list or unread - messages is now activated by a middle-click. - * This is because indicators do not get to control what happens on clicks. - An indicator can register a 'secondary action' which takes place on a - middle-click but nothing else. - * The left/right click behaviour is completely up to the desktop environment. - * Unity shows the menu on both left and right click. - * KDE shows the menu on right click and does nothing on left click. - * I've not investigated what the GNOME indicator plugin does. -* As the indicator is a separate process from pidgin itself, there are - sometimes conflicts with Focus Stealing Prevention when you use the - indicator to go to unread messages. You may need to disable FSP for - Pidgin to get around this. -* Due to how indicators work, the middle-click action must also be a menu - item, so it's the new Show/Hide item at the top of the menu. -* Due to indicator limitations, some of the special icons can't be shown - next to menu items any more. - -Required packages ------------------ - -Runtime: -* pidgin 2.10.x -* libappindicator-0.1 - -Buildtime: -* build-essential -* pidgin-dev -* libappindicator-dev -* autoconf -* automake -* libtool -* intltool - -The ``configure`` script can be generated by running: -* autoreconf -i - -Binary Package Repositories ---------------------------- - -These repositories are managed by third parties, so I can't take credit -or blame for them. But I can definitely thank them for their efforts! - -* Ubuntu: https://launchpad.net/~nilarimogard/+archive/ubuntu/webupd8 -* Fedora (Official): http://koji.fedoraproject.org/koji/packageinfo?packageID=22135 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pidgin-indicator-1.0/README.md new/pidgin-indicator-1.0.1/README.md --- old/pidgin-indicator-1.0/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/pidgin-indicator-1.0.1/README.md 2017-10-03 05:34:42.000000000 +0200 @@ -0,0 +1,76 @@ +pidgin-indicator: AppIndicator/KStatusNotifierItem Plugin for Pidgin +==================================================================== + +This plugins provides an AppIndicator/KStatusNotifierItem for pidgin. All +the current desktop environments are moving away from XEmbed based systray +icons, and that is the only kind of icon that Pidigin provides out of the +box. + +Ubuntu Unity (now deprecated) and KDE Plasma provide native support for +AppIndicators/KStatusNotifierItems, and a gnome-shell extension provides +support in GNOME (and this extension is installed by default in Ubuntu +starting in 17.10). + +I originally developed this plugin when Ubuntu Unity dropped support for +legacy systray icons and I found the official alternative - their Messaging +indicator - to be inadequate. It consolidated status from multiple +applications, and I found it to be much less usable than the original Pidgin +tray icon. Ultimately, with the move from Unity to GNOME in Ubuntu, this +Messaging indicator has been deprecated so there's even more reason for +this plugin to exist. + +Functionality +------------- + +The indicator provides all the same functionality as the original tray icon, +but not in exactly the same way. + +* The 'smart' click behaviour that either shows the buddy list or unread + messages is mapped to the appindicator 'secondary action'. + * This is because indicators do not get to control what happens on clicks. + The 'secondary action' is intended to be something done instead of showing + the menu. It is up to the indicator provider in the destkop environment + to decide what action triggers the secondary action, if at all. + * In Unity, a middle-click triggers the secondary action + * In gnome-shell using the AppIndicator/KStatusNotifierItem extension, + very recent versions now support the same middle-click behaviour as in + Unity. This extension is installed by default with Ubuntu 17.10. + * I'm not sure what KDE Plasma does. Some people have said it also + does secondary activation on a middle click, and some say a left click. + I think this may have changed over successive releases. +* As the indicator is a separate process from pidgin itself, there are + sometimes conflicts with Focus Stealing Prevention when you use the + indicator to go to unread messages. You may need to disable FSP for + Pidgin to get around this. +* Due to how indicators work, the secondary action must also be a menu + item, so it's the new Show/Hide item at the top of the menu. +* Due to indicator limitations, some of the special icons can't be shown + next to menu items any more. + +Required packages +----------------- + +Runtime: +* pidgin 2.10.x +* libappindicator-0.1 + +Buildtime: +* build-essential +* pidgin-dev +* libappindicator-dev +* autoconf +* automake +* libtool +* intltool + +The ``configure`` script can be generated by running: +* autoreconf -i + +Binary Package Repositories +--------------------------- + +These repositories are managed by third parties, so I can't take credit +or blame for them. But I can definitely thank them for their efforts! + +* Ubuntu: https://launchpad.net/~nilarimogard/+archive/ubuntu/webupd8 +* Fedora (Official): http://koji.fedoraproject.org/koji/packageinfo?packageID=22135 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pidgin-indicator-1.0/config.h.in new/pidgin-indicator-1.0.1/config.h.in --- old/pidgin-indicator-1.0/config.h.in 2016-05-18 18:14:40.000000000 +0200 +++ new/pidgin-indicator-1.0.1/config.h.in 2018-05-02 20:12:56.000000000 +0200 @@ -12,6 +12,14 @@ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + /* Define to 1 if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pidgin-indicator-1.0/configure.ac new/pidgin-indicator-1.0.1/configure.ac --- old/pidgin-indicator-1.0/configure.ac 2016-05-18 18:12:44.000000000 +0200 +++ new/pidgin-indicator-1.0.1/configure.ac 2018-05-02 20:12:04.000000000 +0200 @@ -3,7 +3,7 @@ # pidgin-encryption configure script, thanks guys ;) # -AC_INIT([pidgin-indicator], [1.0], [[email protected]]) +AC_INIT([pidgin-indicator], [1.0.1], [[email protected]]) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pidgin-indicator-1.0/src/gtkdocklet.c new/pidgin-indicator-1.0.1/src/gtkdocklet.c --- old/pidgin-indicator-1.0/src/gtkdocklet.c 2014-05-14 18:47:27.000000000 +0200 +++ new/pidgin-indicator-1.0.1/src/gtkdocklet.c 2017-01-11 18:12:18.000000000 +0100 @@ -133,7 +133,6 @@ static void docklet_build_unread(GtkWidget *menuitem) { if (pending) { - g_print("Building unread menu\n"); GList *l = get_pending_list(0); if (l == NULL) { gtk_widget_set_sensitive(menuitem, FALSE); @@ -149,7 +148,6 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu); } } else { - g_print("No unread menu\n"); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), NULL); gtk_widget_set_sensitive(menuitem, FALSE); } ++++++ pidgin-indicator-ayatana-appindicator.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,20 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0]) AC_SUBST(GTK_LIBS) AC_SUBST(GTK_CFLAGS) -PKG_CHECK_MODULES(INDICATOR, [appindicator-0.1]) +PKG_CHECK_EXISTS([ayatana-appindicator-0.1], + [have_ayatana_appindicator="yes"], + [have_ayatana_appindicator="no"]) +PKG_CHECK_EXISTS([appindicator-0.1], + [have_ubuntu_appindicator="yes"], + [have_ubuntu_appindicator="no"]) + +if test "x$have_ayatana_appindicator" = "xyes" || + test "x$have_ubuntu_appindicator" = "xno"; then + PKG_CHECK_MODULES(INDICATOR, [ayatana-appindicator-0.1]) + AC_DEFINE(HAVE_AYATANA_APPINDICATOR, 1, [ayatana-appindicator present]) +else + PKG_CHECK_MODULES(INDICATOR, [appindicator-0.1]) +fi AC_SUBST(INDICATOR_LIBS) AC_SUBST(INDICATOR_CFLAGS) --- a/src/pidgin-indicator.c +++ b/src/pidgin-indicator.c @@ -41,7 +41,11 @@ #include <savedstatuses.h> #include <version.h> +#ifdef HAVE_AYATANA_APPINDICATOR +#include <libayatana-appindicator/app-indicator.h> +#else #include <libappindicator/app-indicator.h> +#endif #include "docklet.h"
