Hello community, here is the log from the commit of package libindicator for openSUSE:Factory checked in at 2015-06-16 14:05:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libindicator (Old) and /work/SRC/openSUSE:Factory/.libindicator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libindicator" Changes: -------- --- /work/SRC/openSUSE:Factory/libindicator/libindicator.changes 2014-03-22 18:01:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libindicator.new/libindicator.changes 2015-06-16 14:05:30.000000000 +0200 @@ -1,0 +2,14 @@ +Tue May 5 13:47:23 UTC 2015 - sor.ale...@meowr.ru + +- Update to 12.10.2+bzr20140922: + + No changes. +- Spec cleanup. + +------------------------------------------------------------------- +Sun Oct 26 13:22:34 UTC 2014 - p.drou...@gmail.com + +- Update to version 12.10.2+14.04.20141007.1 + + No changelog available +- Use download Url as source + +------------------------------------------------------------------- Old: ---- libindicator_12.10.2+14.04.20140304.orig.tar.gz New: ---- libindicator_12.10.2+14.10.20140922.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libindicator.spec ++++++ --- /var/tmp/diff_new_pack.QIfC3S/_old 2015-06-16 14:05:31.000000000 +0200 +++ /var/tmp/diff_new_pack.QIfC3S/_new 2015-06-16 14:05:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libindicator # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,18 +16,18 @@ # +%define lname libindicator3-7 +%define lname_gtk2 libindicator7 +%define _version 12.10.2+14.10.20140922 Name: libindicator -%define _gtk2_name libindicator7 -%define _gtk3_name libindicator3-7 -Version: 12.10.2+14.04.20140304 +Version: 12.10.2+bzr20140922 Release: 0 Summary: Panel indicator applet libraries License: GPL-3.0 Group: System/GUI/Other Url: https://launchpad.net/libindicator -Source: %{name}_%{version}.orig.tar.gz -# PATCH-FIX-OPENSUSE dont-build-debug-tools.patch -- they are used only for tests & developing indicators. -# also, it pulls libido requirement, which does not exists on openSUSE +Source: http://archive.ubuntu.com/ubuntu/pool/main/libi/%{name}/%{name}_%{_version}.orig.tar.gz +# PATCH-FIX-OPENSUSE dont-build-debug-tools.patch hrvoje.sen...@gmail.com -- Do not build debug tools that are used only for tests & developing indicators, which pulls libido. Patch0: dont-build-debug-tools.patch BuildRequires: gnome-common BuildRequires: pkgconfig(dbus-glib-1) @@ -36,107 +36,97 @@ BuildRequires: pkgconfig(gtk+-3.0) %description -This library contains information to build indicators to go into the indicator -applet. - +This library contains information to build indicators to go into +the indicator applet. -%package -n %{_gtk2_name} -Summary: Panel indicator applet - shared libraries +%package -n %{lname} +Summary: Panel indicator applet - Shared Libraries Group: System/Libraries -%description -n %{_gtk2_name} -This package provides the libraries required to build indicators and to go into -the indicator applet. +%description -n %{lname} +This package provides the libraries required to build indicators +and to go into the indicator applet. -%package -n %{_gtk3_name} -Summary: Panel indicator applet - shared libraries +%package -n %{lname_gtk2} +Summary: Panel indicator applet -- Shared Libraries Group: System/Libraries -%description -n %{_gtk3_name} -This package provides the libraries required to build indicators and to go into -the indicator applet. - +%description -n %{lname_gtk2} +This package provides the libraries required to build indicators +and to go into the indicator applet. -%package devel -Summary: Panel indicator applet - development files +%package -n libindicator3-devel +Summary: Panel indicator applet -- Development Files Group: Development/Libraries/Other -Requires: %{_gtk2_name} = %{version} +Requires: %{lname} = %{version} -%description devel -This package provides the development files required to build indicators and to -go into the indicator applet. +%description -n libindicator3-devel +This package provides the development files required to build +indicators and to go into the indicator applet. -%package -n libindicator3-devel -Summary: Panel indicator applet - development files +%package devel +Summary: Panel indicator applet -- Development Files Group: Development/Libraries/Other -Requires: %{_gtk3_name} = %{version} +Requires: %{lname_gtk2} = %{version} -%description -n libindicator3-devel -This package provides the development files required to build indicators and to -go into the indicator applet. +%description devel +This package provides the development files required to build +indicators and to go into the indicator applet. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{_version} %patch0 -p1 %build %global _configure ../configure -NOCONFIGURE=1 sh autogen.sh -export V=1 -mkdir -p build-gtk2 build-gtk3 - -pushd build-gtk2 -%configure --with-gtk=2 --disable-static -make %{?_smp_mflags} -popd - -pushd build-gtk3 -%configure --with-gtk=3 --disable-static -make %{?_smp_mflags} -popd +NOCONFIGURE=1 ./autogen.sh +for ver in 2 3; do + mkdir build-gtk$ver + pushd build-gtk$ver + %configure --disable-static --with-gtk=$ver + make %{?_smp_mflags} + popd +done %install -pushd build-gtk2 -%make_install -popd - -pushd build-gtk3 -%make_install -popd +for ver in 2 3; do + pushd build-gtk$ver + %make_install + popd +done +find %{buildroot} -type f -name "*.la" -delete -print -find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print - -# this dummy indicator is fairly useless, it's not shipped in Ubuntu +# This dummy indicator is fairly useless, it is not shipped in Ubuntu. rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so -%post -n %{_gtk2_name} -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%postun -n %{_gtk2_name} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig -%post -n %{_gtk3_name} -p /sbin/ldconfig +%post -n %{lname_gtk2} -p /sbin/ldconfig -%postun -n %{_gtk3_name} -p /sbin/ldconfig +%postun -n %{lname_gtk2} -p /sbin/ldconfig -%files -n %{_gtk2_name} +%files -n %{lname} %defattr(-,root,root) -%doc AUTHORS COPYING -%{_libdir}/%{name}.so.* - -%files -n %{_gtk3_name} -%defattr(-,root,root) -%doc AUTHORS COPYING +%doc AUTHORS COPYING NEWS %{_libdir}/%{name}3.so.* -%files devel +%files -n %{lname_gtk2} %defattr(-,root,root) -%{_includedir}/%{name}-0.4/ -%{_libdir}/pkgconfig/indicator-0.4.pc -%{_libdir}/%{name}.so +%doc AUTHORS COPYING NEWS +%{_libdir}/%{name}.so.* %files -n libindicator3-devel %defattr(-,root,root) %{_includedir}/%{name}3-0.4/ -%{_libdir}/pkgconfig/indicator3-0.4.pc %{_libdir}/%{name}3.so +%{_libdir}/pkgconfig/indicator3-0.4.pc + +%files devel +%defattr(-,root,root) +%{_includedir}/%{name}-0.4/ +%{_libdir}/%{name}.so +%{_libdir}/pkgconfig/indicator-0.4.pc %changelog ++++++ libindicator_12.10.2+14.04.20140304.orig.tar.gz -> libindicator_12.10.2+14.10.20140922.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libindicator-12.10.2+14.04.20140304/libindicator/indicator-image-helper.c new/libindicator-12.10.2+14.10.20140922/libindicator/indicator-image-helper.c --- old/libindicator-12.10.2+14.04.20140304/libindicator/indicator-image-helper.c 2014-03-04 11:58:28.000000000 +0100 +++ new/libindicator-12.10.2+14.10.20140922/libindicator/indicator-image-helper.c 2014-09-22 15:40:07.000000000 +0200 @@ -69,7 +69,7 @@ return; } - if (icon_info != NULL) { + if (icon_info != NULL && !G_IS_BYTES_ICON(icon_names)) { GdkPixbuf *pixbuf = gtk_icon_info_load_icon(icon_info, NULL); if (gdk_pixbuf_get_height(pixbuf) < ICON_SIZE) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libindicator-12.10.2+14.04.20140304/libindicator/indicator-ng.c new/libindicator-12.10.2+14.10.20140922/libindicator/indicator-ng.c --- old/libindicator-12.10.2+14.04.20140304/libindicator/indicator-ng.c 2014-03-04 11:58:13.000000000 +0100 +++ new/libindicator-12.10.2+14.10.20140922/libindicator/indicator-ng.c 2014-09-22 15:41:25.000000000 +0200 @@ -194,8 +194,12 @@ if (self->actions && self->scroll_action) { - if (direction == INDICATOR_OBJECT_SCROLL_DOWN) - delta *= -1; + if (direction == INDICATOR_OBJECT_SCROLL_DOWN || + direction == INDICATOR_OBJECT_SCROLL_LEFT) + { + delta *= -1; + } + g_action_group_activate_action (self->actions, self->scroll_action, g_variant_new_int32 (delta)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libindicator-12.10.2+14.04.20140304/tools/indicator-loader.c new/libindicator-12.10.2+14.10.20140922/tools/indicator-loader.c --- old/libindicator-12.10.2+14.04.20140304/tools/indicator-loader.c 2014-03-04 11:58:13.000000000 +0100 +++ new/libindicator-12.10.2+14.10.20140922/tools/indicator-loader.c 2014-09-22 15:41:25.000000000 +0200 @@ -55,6 +55,50 @@ } } +static void +scroll_entry (GtkWidget *widget, GdkEventScroll* event, gpointer user_data) +{ + gpointer entry; + + g_return_if_fail (INDICATOR_IS_OBJECT(user_data)); + + entry = g_object_get_qdata (G_OBJECT(widget), entry_data_quark()); + IndicatorScrollDirection direction = G_MAXINT; + + switch (event->direction) + { + case GDK_SCROLL_UP: + direction = INDICATOR_OBJECT_SCROLL_UP; + break; + case GDK_SCROLL_DOWN: + direction = INDICATOR_OBJECT_SCROLL_DOWN; + break; + case GDK_SCROLL_LEFT: + direction = INDICATOR_OBJECT_SCROLL_LEFT; + break; + case GDK_SCROLL_RIGHT: + direction = INDICATOR_OBJECT_SCROLL_RIGHT; + break; + default: + break; + } + + if (entry == NULL) + { + g_debug("Scroll on: (null)"); + } + else if (direction == G_MAXINT) + { + g_debug("Scroll direction not supported"); + } + else + { + g_signal_emit_by_name(INDICATOR_OBJECT(user_data), + INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, + entry, 1, direction); + } +} + static GtkWidget* create_menu_item (IndicatorObjectEntry * entry) { @@ -106,6 +150,9 @@ g_object_set_qdata (G_OBJECT(menu_item), entry_data_quark(), entry); g_signal_connect (menu_item, "activate", G_CALLBACK(activate_entry), io); + gtk_widget_set_events (menu_item, gtk_widget_get_events (menu_item) | GDK_SCROLL_MASK); + g_signal_connect (menu_item, "scroll-event", G_CALLBACK(scroll_entry), io); + gtk_menu_shell_append (GTK_MENU_SHELL(user_data), menu_item); }
